@@ -194,7 +194,7 @@ uninstall: uninstall-program
194osx_dest:=osx-pkg-tmp
194osx_dest:=osx-pkg-tmp
195osx_src:=osx
195osx_src:=osx
196doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
196doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
197−osx_pkg_name:=Pandoc_$(VERSION).pkg
197+osx_pkg_name:=$(NAME)_$(VERSION).pkg
198cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name)
198cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name)
199osx-pkg-prep: build-program $(osx_dest)
199osx-pkg-prep: build-program $(osx_dest)
200$(osx_dest)/: $(doc_more)
200$(osx_dest)/: $(doc_more)
@@ -225,20 +225,20 @@ osx-pkg: osx-pkg-prep
225 -rm -rf $(osx_dest)
225 -rm -rf $(osx_dest)
227.PHONY: osx-dmg
227.PHONY: osx-dmg
228−osx_dmg_name:=Pandoc.dmg
228+osx_dmg_name:=$(NAME).dmg
229+osx_udzo_name:=$(NAME).udzo.dmg
229−osx_dmg_volume:="Pandoc $(VERSION)"
230+osx_dmg_volume:="$(NAME) $(VERSION)"
230−cleanup_files+=$(osx_dmg_name)
231−osx-dmg: $(osx_dmg_name)
231+osx-dmg: ../$(osx_dmg_name)
232−$(osx_dmg_name): $(osx_pkg_name)
232+../$(osx_dmg_name): $(osx_pkg_name)
233 -rm -f $(osx_dmg_name)
233 -rm -f $(osx_dmg_name)
234 hdiutil create $(osx_dmg_name) -size 05m -fs HFS+ -volname $(osx_dmg_volume)
234 hdiutil create $(osx_dmg_name) -size 05m -fs HFS+ -volname $(osx_dmg_volume)
235 dev_handle=`hdid $(osx_dmg_name) | grep Apple_HFS | \
235 dev_handle=`hdid $(osx_dmg_name) | grep Apple_HFS | \
236 perl -e '\$$_=<>; /^\\/dev\\/(disk.)/; print \$$1'`; \
236 perl -e '\$$_=<>; /^\\/dev\\/(disk.)/; print \$$1'`; \
237 ditto $(osx_pkg_name) /Volumes/$(osx_dmg_volume)/$(osx_pkg_name); \
237 ditto $(osx_pkg_name) /Volumes/$(osx_dmg_volume)/$(osx_pkg_name); \
238 hdiutil detach $$dev_handle
238 hdiutil detach $$dev_handle
239− hdiutil convert $(osx_dmg_name) -format UDZO -o Pandoc.udzo.dmg
239+ hdiutil convert $(osx_dmg_name) -format UDZO -o $(osx_udzo_name)
240 -rm -f $(osx_dmg_name)
240 -rm -f $(osx_dmg_name)
241− mv Pandoc.udzo.dmg $(osx_dmg_name)
241+ mv $(osx_udzo_name) ../$(osx_dmg_name)
243.PHONY: test test-markdown
243.PHONY: test test-markdown
244test: $(MAIN)
244test: $(MAIN)
@@ -294,8 +294,8 @@ make_page:=./$(MAIN) -s -B $(web_src)/header.html \
294cleanup_files+=$(web_dest)
294cleanup_files+=$(web_dest)
295website: $(web_dest)
295website: $(web_dest)
296$(web_dest)/: $(MAIN) html $(tarball_name)
296$(web_dest)/: $(MAIN) html $(tarball_name)
297− @[ -f $(osx_dmg_name) ] || { \
297+ @[ -f ../$(osx_dmg_name) ] || { \
298− echo "*** Missing $(osx_dmg_name). ***"; \
298+ echo "*** Missing ../$(osx_dmg_name). ***"; \
299 exit 1; \
299 exit 1; \
301 @[ -f ../$(deb_main) ] || { \
301 @[ -f ../$(deb_main) ] || { \
@@ -306,7 +306,7 @@ $(web_dest)/: $(MAIN) html $(tarball_name)
307 mkdir $(web_dest); \
307 mkdir $(web_dest); \
308 cp -r html $(web_dest)/doc; \
308 cp -r html $(web_dest)/doc; \
309− cp $(osx_dmg_name) $(web_dest)/; \
309+ cp ../$(osx_dmg_name) $(web_dest)/; \
310 cp ../$(deb_main) $(web_dest)/; \
310 cp ../$(deb_main) $(web_dest)/; \
311 cp $(tarball_name) $(web_dest)/; \
311 cp $(tarball_name) $(web_dest)/; \
312 cp $(web_src)/*.css $(web_dest)/; \
312 cp $(web_src)/*.css $(web_dest)/; \