@@ -166,10 +166,12 @@ uninstall: uninstall-program
166166
167167.PHONY: osx-pkg
168168osx_dest:=osx-pkg
169−doc_more:=README.rtf LICENSE.rtf OSX-Welcome.rtf
170−cleanup_files+=$(osx_dest) $(doc_more)
169+osx_src:=osx
170+doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
171+osx_pkg_name:=Pandoc_$(VERSION).pkg
172+cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name)
171173osx-pkg: $(osx_dest)
172−$(osx_dest): $(doc_more)
174+$(osx_dest): $(doc_more) $(BINS)
173175 -rm -rf $(osx_dest)
174176 $(INSTALL) -d $(osx_dest)
175177 DESTDIR=$(osx_dest)/Package_root $(MAKE) install-program
@@ -179,14 +181,30 @@ $(osx_dest): $(doc_more)
179181 $(INSTALL) -d $(osx_dest)/Resources
180182 mv README.rtf $(osx_dest)/Resources/ReadMe.rtf
181183 mv LICENSE.rtf $(osx_dest)/Resources/License.rtf
182− sed -e 's#@PREFIX@#$(PREFIX)#g' OSX-Welcome.rtf > $(osx_dest)/Resources/Welcome.rtf
183− sed -e 's/@VERSION@/$(VERSION)/g' Info.plist > $(osx_dest)/Info.plist
184− cp Description.plist $(osx_dest)/
185− PackageMaker -build -p Pandoc_$(VERSION).pkg \
186− -f $(osx_dest)/Package_root \
187− -r $(osx_dest)/Resources \
188− -i $(osx_dest)/Info.plist \
189− -d $(osx_dest)/Description.plist
184+ sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome.rtf > $(osx_dest)/Resources/Welcome.rtf
185+ sed -e 's/@VERSION@/$(VERSION)/g' $(osx_src)/Info.plist > $(osx_dest)/Info.plist
186+ cp $(osx_src)/Description.plist $(osx_dest)/
187+ PackageMaker -build -p $(osx_pkg_name) \
188+ -f $(osx_dest)/Package_root \
189+ -r $(osx_dest)/Resources \
190+ -i $(osx_dest)/Info.plist \
191+ -d $(osx_dest)/Description.plist
192+
193+.PHONY: osx-dmg
194+osx_dmg_name:=Pandoc.dmg
195+osx_dmg_volume:="Pandoc $(VERSION)"
196+cleanup_files+=$(osx_dmg_name)
197+osx-dmg: osx-pkg
198+ -rm -f $(osx_dmg_name)
199+ hdiutil create $(osx_dmg_name) -size 05m -fs HFS+ -volname $(osx_dmg_volume)
200+ dev_handle=`hdid $(osx_dmg_name) | grep Apple_HFS | perl -e '\$$_=<>; /^\\/dev\\/(disk.)/; print \$$1'`;\
201+ ditto $(osx_pkg_name) /Volumes/$(osx_dmg_volume)/$(osx_pkg_name);\
202+ hdiutil detach $$dev_handle
203+ hdiutil convert $(osx_dmg_name) -format UDZO -o Pandoc.udzo.dmg
204+ rm -f $(osx_dmg_name)
205+ mv Pandoc.udzo.dmg $(osx_dmg_name)
206+ chown root $(osx_dmg_name)
207+ chgrp wheel $(osx_dmg_name)
190208
191209.PHONY: test test-markdown
192210test: $(BINS)