@@ -164,6 +164,7 @@ uninstall-all: uninstall-exec uninstall-doc uninstall-lib-doc
164164install: install-program
165165uninstall: uninstall-program
166166
167+.PHONY: osx-pkg osx-pkg-prep
167168osx_dest:=osx-pkg-tmp
168169osx_src:=osx
169170doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
@@ -183,38 +184,37 @@ $(osx_dest): $(doc_more) $(BINS)
183184 sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome.rtf > $(osx_dest)/Resources/Welcome.rtf
184185 sed -e 's/@VERSION@/$(VERSION)/g' $(osx_src)/Info.plist > $(osx_dest)/Info.plist
185186 cp $(osx_src)/Description.plist $(osx_dest)/
186−
187187osx-pkg: osx-pkg-prep
188188 if [ "`id -u`" != 0 ]; then \
189189 echo "Root permissions needed to create OSX package!"; \
190− exit 0; \
190+ exit 1; \
191191 fi
192192 find $(osx_dest) -type f | xargs chown root:wheel
193193 PackageMaker -build -p $(osx_pkg_name) \
194− -f $(osx_dest)/Package_root \
195− -r $(osx_dest)/Resources \
196− -i $(osx_dest)/Info.plist \
197− -d $(osx_dest)/Description.plist
198− rm -rf $(osx_dest)
194+ -f $(osx_dest)/Package_root \
195+ -r $(osx_dest)/Resources \
196+ -i $(osx_dest)/Info.plist \
197+ -d $(osx_dest)/Description.plist
198+ -rm -rf $(osx_dest)
199199
200+.PHONY: osx-dmg osx-dmg-prep
200201osx_dmg_name:=Pandoc.dmg
201202osx_dmg_volume:="Pandoc $(VERSION)"
202203cleanup_files+=$(osx_dmg_name)
203204osx-dmg-prep: $(osx_pkg_name)
204205 -rm -f $(osx_dmg_name)
205206 hdiutil create $(osx_dmg_name) -size 05m -fs HFS+ -volname $(osx_dmg_volume)
206− dev_handle=`hdid $(osx_dmg_name) | grep Apple_HFS | perl -e '\$$_=<>; /^\\/dev\\/(disk.)/; print \$$1'`;\
207− ditto $(osx_pkg_name) /Volumes/$(osx_dmg_volume)/$(osx_pkg_name);\
207+ dev_handle=`hdid $(osx_dmg_name) | grep Apple_HFS | \
208+ perl -e '\$$_=<>; /^\\/dev\\/(disk.)/; print \$$1'`; \
209+ ditto $(osx_pkg_name) /Volumes/$(osx_dmg_volume)/$(osx_pkg_name); \
208210 hdiutil detach $$dev_handle
209211 hdiutil convert $(osx_dmg_name) -format UDZO -o Pandoc.udzo.dmg
210− rm -f $(osx_dmg_name)
212+ -rm -f $(osx_dmg_name)
211213 mv Pandoc.udzo.dmg $(osx_dmg_name)
212−
213−.PHONY: osx-dmg
214214osx-dmg: osx-dmg-prep
215215 if [ "`id -u`" != 0 ]; then \
216216 echo "Root permissions needed to create OSX disk image!"; \
217− exit 0; \
217+ exit 1; \
218218 fi
219219 chown root:wheel $(osx_dmg_name)
220220