@@ -164,37 +164,42 @@ uninstall-all: uninstall-exec uninstall-doc uninstall-lib-doc
164install: install-program
164install: install-program
165uninstall: uninstall-program
165uninstall: uninstall-program
168−osx_dest:=osx-pkg
167+osx_dest:=osx-pkg-tmp
169osx_src:=osx
168osx_src:=osx
170doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
169doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
171osx_pkg_name:=Pandoc_$(VERSION).pkg
170osx_pkg_name:=Pandoc_$(VERSION).pkg
172cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name)
171cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name)
173−osx-pkg: $(osx_dest)
172+osx-pkg-prep: $(osx_dest)
174$(osx_dest): $(doc_more) $(BINS)
173$(osx_dest): $(doc_more) $(BINS)
175 -rm -rf $(osx_dest)
174 -rm -rf $(osx_dest)
176 $(INSTALL) -d $(osx_dest)
175 $(INSTALL) -d $(osx_dest)
177 DESTDIR=$(osx_dest)/Package_root $(MAKE) install-program
176 DESTDIR=$(osx_dest)/Package_root $(MAKE) install-program
178 find $(osx_dest) -type f -regex ".*bin/.*" | xargs chmod +x
177 find $(osx_dest) -type f -regex ".*bin/.*" | xargs chmod +x
179 find $(osx_dest) -type f -regex ".*bin/$(THIS)" | xargs $(STRIP)
178 find $(osx_dest) -type f -regex ".*bin/$(THIS)" | xargs $(STRIP)
180− find $(osx_dest) -type f | xargs chown root:wheel
181 $(INSTALL) -d $(osx_dest)/Resources
179 $(INSTALL) -d $(osx_dest)/Resources
182 mv README.rtf $(osx_dest)/Resources/ReadMe.rtf
180 mv README.rtf $(osx_dest)/Resources/ReadMe.rtf
183 mv LICENSE.rtf $(osx_dest)/Resources/License.rtf
181 mv LICENSE.rtf $(osx_dest)/Resources/License.rtf
184 sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome.rtf > $(osx_dest)/Resources/Welcome.rtf
182 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
183 sed -e 's/@VERSION@/$(VERSION)/g' $(osx_src)/Info.plist > $(osx_dest)/Info.plist
186 cp $(osx_src)/Description.plist $(osx_dest)/
184 cp $(osx_src)/Description.plist $(osx_dest)/
186+osx-pkg: osx-pkg-prep
187+ if [ "`id -u`" != 0 ]; then \
188+ echo "Root permissions needed to create OSX package!"; \
191+ find $(osx_dest) -type f | xargs chown root:wheel
187 PackageMaker -build -p $(osx_pkg_name) \
192 PackageMaker -build -p $(osx_pkg_name) \
188 -f $(osx_dest)/Package_root \
193 -f $(osx_dest)/Package_root \
189 -r $(osx_dest)/Resources \
194 -r $(osx_dest)/Resources \
190 -i $(osx_dest)/Info.plist \
195 -i $(osx_dest)/Info.plist \
191 -d $(osx_dest)/Description.plist
196 -d $(osx_dest)/Description.plist
194osx_dmg_name:=Pandoc.dmg
199osx_dmg_name:=Pandoc.dmg
195osx_dmg_volume:="Pandoc $(VERSION)"
200osx_dmg_volume:="Pandoc $(VERSION)"
196cleanup_files+=$(osx_dmg_name)
201cleanup_files+=$(osx_dmg_name)
197−osx-dmg: osx-pkg
202+osx-dmg-prep: $(osx_pkg_name)
198 -rm -f $(osx_dmg_name)
203 -rm -f $(osx_dmg_name)
199 hdiutil create $(osx_dmg_name) -size 05m -fs HFS+ -volname $(osx_dmg_volume)
204 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'`;\
205 dev_handle=`hdid $(osx_dmg_name) | grep Apple_HFS | perl -e '\$$_=<>; /^\\/dev\\/(disk.)/; print \$$1'`;\
@@ -203,8 +208,14 @@ osx-dmg: osx-pkg
203 hdiutil convert $(osx_dmg_name) -format UDZO -o Pandoc.udzo.dmg
208 hdiutil convert $(osx_dmg_name) -format UDZO -o Pandoc.udzo.dmg
204 rm -f $(osx_dmg_name)
209 rm -f $(osx_dmg_name)
205 mv Pandoc.udzo.dmg $(osx_dmg_name)
210 mv Pandoc.udzo.dmg $(osx_dmg_name)
206− chown root $(osx_dmg_name)
211+
213+osx-dmg: osx-dmg-prep
214+ if [ "`id -u`" != 0 ]; then \
215+ echo "Root permissions needed to create OSX disk image!"; \
207− chgrp wheel $(osx_dmg_name)
218+ chown root:wheel $(osx_dmg_name)
209.PHONY: test test-markdown
220.PHONY: test test-markdown
210test: $(BINS)
221test: $(BINS)