diff options
| -rw-r--r-- | Makefile | 20 | ||||
| -rwxr-xr-x | cabalize | 2 | ||||
| -rw-r--r-- | osx/Welcome | 4 | ||||
| -rwxr-xr-x | osx/uninstall-pandoc | 3 |
4 files changed, 12 insertions, 17 deletions
@@ -164,14 +164,13 @@ uninstall-all: uninstall-exec uninstall-doc uninstall-lib-doc install: install-program uninstall: uninstall-program -.PHONY: osx-pkg osx-pkg-prep osx_dest:=osx-pkg-tmp osx_src:=osx doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf osx_pkg_name:=Pandoc_$(VERSION).pkg cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name) osx-pkg-prep: $(osx_dest) -$(osx_dest): $(doc_more) $(BINS) +$(osx_dest)/: $(doc_more) $(BINS) -rm -rf $(osx_dest) $(INSTALL) -d $(osx_dest) DESTDIR=$(osx_dest)/Package_root $(MAKE) install-program @@ -179,8 +178,8 @@ $(osx_dest): $(doc_more) $(BINS) find $(osx_dest) -type f -regex ".*bin/.*" | xargs chmod +x find $(osx_dest) -type f -regex ".*bin/$(THIS)" | xargs $(STRIP) $(INSTALL) -d $(osx_dest)/Resources - mv README.rtf $(osx_dest)/Resources/ReadMe.rtf - mv LICENSE.rtf $(osx_dest)/Resources/License.rtf + cp README.rtf $(osx_dest)/Resources/ReadMe.rtf + cp LICENSE.rtf $(osx_dest)/Resources/License.rtf sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome.rtf > $(osx_dest)/Resources/Welcome.rtf sed -e 's/@VERSION@/$(VERSION)/g' $(osx_src)/Info.plist > $(osx_dest)/Info.plist cp $(osx_src)/Description.plist $(osx_dest)/ @@ -189,19 +188,20 @@ osx-pkg: osx-pkg-prep echo "Root permissions needed to create OSX package!"; \ exit 1; \ fi - find $(osx_dest) -type f | xargs chown root:wheel + find $(osx_dest) | xargs chown root:wheel PackageMaker -build -p $(osx_pkg_name) \ -f $(osx_dest)/Package_root \ -r $(osx_dest)/Resources \ -i $(osx_dest)/Info.plist \ -d $(osx_dest)/Description.plist + chgrp admin $(osx_pkg_name) -rm -rf $(osx_dest) -.PHONY: osx-dmg osx-dmg-prep +.PHONY: osx-dmg osx_dmg_name:=Pandoc.dmg osx_dmg_volume:="Pandoc $(VERSION)" cleanup_files+=$(osx_dmg_name) -osx-dmg-prep: $(osx_pkg_name) +osx-dmg: $(osx_pkg_name) -rm -f $(osx_dmg_name) hdiutil create $(osx_dmg_name) -size 05m -fs HFS+ -volname $(osx_dmg_volume) dev_handle=`hdid $(osx_dmg_name) | grep Apple_HFS | \ @@ -211,12 +211,6 @@ osx-dmg-prep: $(osx_pkg_name) hdiutil convert $(osx_dmg_name) -format UDZO -o Pandoc.udzo.dmg -rm -f $(osx_dmg_name) mv Pandoc.udzo.dmg $(osx_dmg_name) -osx-dmg: osx-dmg-prep - if [ "`id -u`" != 0 ]; then \ - echo "Root permissions needed to create OSX disk image!"; \ - exit 1; \ - fi - chown root:wheel $(osx_dmg_name) .PHONY: test test-markdown test: $(BINS) @@ -30,7 +30,7 @@ BUILD_DEPENDS=$(echo $BUILD_DEPENDS | sed -e 's# #, #g') # Handle 'Hs-Source-Dir' option name which was deprecated in Cabal > 1.1.3. HS_SOURCE_DIRS='Hs-Source-Dirs' -cabal_version=$(ghc-pkg -l | sed -ne 's/.*\<[Cc]abal-\([^,]*\).*/\1/p') +cabal_version=$(ghc-pkg -l | sed -ne 's/.*[Cc]abal-\([^,]*\).*/\1/p') if printf "$cabal_version\n1.1.3" | sort | tail -n 1 | grep -q '1\.1\.3'; then HS_SOURCE_DIRS='Hs-Source-Dir' fi diff --git a/osx/Welcome b/osx/Welcome index 3acc7efd7..5b075ac50 100644 --- a/osx/Welcome +++ b/osx/Welcome @@ -4,8 +4,8 @@ to use `pandoc` and the associated wrapper scripts, you must have default path, add these lines to the end of `.profile` in your home directory and open a new terminal window: - export PATH=/usr/local/bin:$PATH - export MANPATH=/usr/local/man:$MANPATH + export PATH=$PATH:/usr/local/bin + export MANPATH=$MANPATH:/usr/local/share/man To uninstall Pandoc at any time, use the following command: diff --git a/osx/uninstall-pandoc b/osx/uninstall-pandoc index 0e759ed0d..65f6ba76c 100755 --- a/osx/uninstall-pandoc +++ b/osx/uninstall-pandoc @@ -3,7 +3,8 @@ # everything installed by the Pandoc Mac OS X installer. if [ "`id -u`" != 0 ]; then \ - echo "This script must be run with sudo."; \ + echo "This script must be run with root privileges:"; \ + echo "sudo /usr/local/bin/uninstall-pandoc"; \ exit 1; \ fi |