@@ -164,37 +164,42 @@ uninstall-all: uninstall-exec uninstall-doc uninstall-lib-doc
164164install: install-program
165165uninstall: uninstall-program
166166
167−.PHONY: osx-pkg
168−osx_dest:=osx-pkg
167+osx_dest:=osx-pkg-tmp
169168osx_src:=osx
170169doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
171170osx_pkg_name:=Pandoc_$(VERSION).pkg
172171cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name)
173−osx-pkg: $(osx_dest)
172+osx-pkg-prep: $(osx_dest)
174173$(osx_dest): $(doc_more) $(BINS)
175174 -rm -rf $(osx_dest)
176175 $(INSTALL) -d $(osx_dest)
177176 DESTDIR=$(osx_dest)/Package_root $(MAKE) install-program
178177 find $(osx_dest) -type f -regex ".*bin/.*" | xargs chmod +x
179178 find $(osx_dest) -type f -regex ".*bin/$(THIS)" | xargs $(STRIP)
180− find $(osx_dest) -type f | xargs chown root:wheel
181179 $(INSTALL) -d $(osx_dest)/Resources
182180 mv README.rtf $(osx_dest)/Resources/ReadMe.rtf
183181 mv LICENSE.rtf $(osx_dest)/Resources/License.rtf
184182 sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome.rtf > $(osx_dest)/Resources/Welcome.rtf
185183 sed -e 's/@VERSION@/$(VERSION)/g' $(osx_src)/Info.plist > $(osx_dest)/Info.plist
186184 cp $(osx_src)/Description.plist $(osx_dest)/
185+
186+osx-pkg: osx-pkg-prep
187+ if [ "`id -u`" != 0 ]; then \
188+ echo "Root permissions needed to create OSX package!"; \
189+ exit 0; \
190+ fi
191+ find $(osx_dest) -type f | xargs chown root:wheel
187192 PackageMaker -build -p $(osx_pkg_name) \
188193 -f $(osx_dest)/Package_root \
189194 -r $(osx_dest)/Resources \
190195 -i $(osx_dest)/Info.plist \
191196 -d $(osx_dest)/Description.plist
197+ rm -rf $(osx_dest)
192198
193−.PHONY: osx-dmg
194199osx_dmg_name:=Pandoc.dmg
195200osx_dmg_volume:="Pandoc $(VERSION)"
196201cleanup_files+=$(osx_dmg_name)
197−osx-dmg: osx-pkg
202+osx-dmg-prep: $(osx_pkg_name)
198203 -rm -f $(osx_dmg_name)
199204 hdiutil create $(osx_dmg_name) -size 05m -fs HFS+ -volname $(osx_dmg_volume)
200205 dev_handle=`hdid $(osx_dmg_name) | grep Apple_HFS | perl -e '\$$_=<>; /^\\/dev\\/(disk.)/; print \$$1'`;\
@@ -203,8 +208,14 @@ osx-dmg: osx-pkg
203208 hdiutil convert $(osx_dmg_name) -format UDZO -o Pandoc.udzo.dmg
204209 rm -f $(osx_dmg_name)
205210 mv Pandoc.udzo.dmg $(osx_dmg_name)
206− chown root $(osx_dmg_name)
207− chgrp wheel $(osx_dmg_name)
211+
212+.PHONY: osx-dmg
213+osx-dmg: osx-dmg-prep
214+ if [ "`id -u`" != 0 ]; then \
215+ echo "Root permissions needed to create OSX disk image!"; \
216+ exit 0; \
217+ fi
218+ chown root:wheel $(osx_dmg_name)
208219
209220.PHONY: test test-markdown
210221test: $(BINS)