diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | osx/Description.plist | 10 | ||||
| -rw-r--r-- | osx/Info.plist | 42 | ||||
| -rw-r--r-- | osx/Welcome | 26 | ||||
| -rwxr-xr-x | osx/uninstall-pandoc | 43 | ||||
| -rw-r--r-- | web/Makefile | 2 |
6 files changed, 2 insertions, 125 deletions
@@ -336,7 +336,7 @@ make_page:=./$(MAIN) -s -S -B $(web_src)/header.html \ -A $(web_src)/footer.html \ -H $(web_src)/css cleanup_files+=$(web_dest) -$(web_dest) : html $(wildcard $(web_src)/*) $(osx_src)/Welcome changelog \ +$(web_dest) : html $(wildcard $(web_src)/*) changelog \ INSTALL $(MANPAGES) $(MANDIR)/man1/pandoc.1.md README -rm -rf $(web_dest) ( \ @@ -345,8 +345,6 @@ $(web_dest) : html $(wildcard $(web_src)/*) $(osx_src)/Welcome changelog \ cp $(web_src)/* $(web_dest)/; \ sed -e 's#@VERSION@#$(VERSION)#g' $(web_src)/index.txt.in > \ $(web_dest)/index.txt; \ - sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome > \ - $(web_dest)/osx-notes.txt; \ cp changelog $(web_dest)/ ; \ cp README $(web_dest)/ ; \ cp INSTALL $(web_dest)/ ; \ diff --git a/osx/Description.plist b/osx/Description.plist deleted file mode 100644 index 8795e8831..000000000 --- a/osx/Description.plist +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IFPkgDescriptionDescription</key> - <string></string> - <key>IFPkgDescriptionTitle</key> - <string>Pandoc</string> -</dict> -</plist> diff --git a/osx/Info.plist b/osx/Info.plist deleted file mode 100644 index d7dbb4fb7..000000000 --- a/osx/Info.plist +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleGetInfoString</key> - <string>@VERSION@, (c) 2006 John MacFarlane (released under GPL)</string> - <key>CFBundleIdentifier</key> - <string>pandoc</string> - <key>CFBundleShortVersionString</key> - <string>@VERSION@</string> - <key>IFPkgFlagAllowBackRev</key> - <false/> - <key>IFPkgFlagAuthorizationAction</key> - <string>RootAuthorization</string> - <key>IFPkgFlagBackgroundAlignment</key> - <string>topleft</string> - <key>IFPkgFlagBackgroundScaling</key> - <string>none</string> - <key>IFPkgFlagDefaultLocation</key> - <string>/</string> - <key>IFPkgFlagFollowLinks</key> - <true/> - <key>IFPkgFlagInstallFat</key> - <false/> - <key>IFPkgFlagInstalledSize</key> - <integer>1788</integer> - <key>IFPkgFlagIsRequired</key> - <false/> - <key>IFPkgFlagOverwritePermissions</key> - <false/> - <key>IFPkgFlagRelocatable</key> - <false/> - <key>IFPkgFlagRestartAction</key> - <string>NoRestart</string> - <key>IFPkgFlagRootVolumeOnly</key> - <false/> - <key>IFPkgFlagUpdateInstalledLanguages</key> - <false/> - <key>IFPkgFormatVersion</key> - <real>0.10000000149011612</real> -</dict> -</plist> diff --git a/osx/Welcome b/osx/Welcome deleted file mode 100644 index 18a72ad2d..000000000 --- a/osx/Welcome +++ /dev/null @@ -1,26 +0,0 @@ -% OS X Installation Notes - -**Important:** Pandoc requires that `GMP.framework` be installed -on your system. You can obtain it from - -> <http://www.haskell.org/ghc/dist/mac_frameworks/GMP-framework.zip>. - -To install, just unzip and drag the `GMP-framework` directory into your -`/Library/Frameworks` directory. - -Pandoc will be installed into your `@PREFIX@` directory. In order -to use `pandoc` and the associated wrapper scripts, you must have -`@PREFIX@/bin` in your `PATH.` To add `@PREFIX@/bin` to your -default path, add these lines to the end of `.profile` in your home -directory: - - export PATH=$PATH:@PREFIX@/bin - export MANPATH=$MANPATH:@PREFIX@/share/man - -You will have to open a new terminal window for these changes -to take effect. - -To uninstall Pandoc at any time, use the following command: - - sudo @PREFIX@/bin/uninstall-pandoc - diff --git a/osx/uninstall-pandoc b/osx/uninstall-pandoc deleted file mode 100755 index db2001da1..000000000 --- a/osx/uninstall-pandoc +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -e -# This script (when run with root permissions) uninstalls -# everything installed by the Pandoc Mac OS X installer. - -if [ "`id -u`" != 0 ]; then \ - echo "This script must be run with root privileges:"; \ - echo "sudo /usr/local/bin/uninstall-pandoc"; \ - exit 1; \ -fi - -MAN_PAGES="pandoc.1 markdown2pdf.1 html2markdown.1 hsmarkdown.1" -EXECUTABLES=`echo $MAN_PAGES | sed -e 's#\.1##g'` -EXECUTABLES="$EXECUTABLES uninstall-pandoc" -DOCUMENTS="`ls /usr/local/share/doc/pandoc`" -TOREMOVE="" -for F in $EXECUTABLES; do - TOREMOVE="$TOREMOVE /usr/local/bin/$F"; -done -for F in $MAN_PAGES; do - TOREMOVE="$TOREMOVE /usr/local/share/man/man1/$F"; -done -for F in $DOCUMENTS; do - TOREMOVE="$TOREMOVE /usr/local/share/doc/pandoc/$F"; -done -TOREMOVE="$TOREMOVE /usr/local/share/doc/pandoc" - -echo "This script will remove all of the files installed" -echo "by the Pandoc Mac OS X installer: $TOREMOVE" -echo "Are you sure you want to continue with this?" - -OPTIONS="Continue Quit" -select opt in $OPTIONS; do - if [ "$opt" = "Quit" ]; then - exit 0 - elif [ "$opt" = "Continue" ]; then - echo "Removing..." - rm -rv $TOREMOVE - echo "Successfully removed Pandoc." - exit 0 - else - echo "Bad option." - fi -done diff --git a/web/Makefile b/web/Makefile index 708332781..b51ce0bf1 100644 --- a/web/Makefile +++ b/web/Makefile @@ -1,4 +1,4 @@ -ALL := index.html osx-notes.html README.html INSTALL.html examples.html pandoc1.html markdown2pdf1.html html2markdown1.html hsmarkdown1.html +ALL := index.html README.html INSTALL.html examples.html pandoc1.html markdown2pdf1.html html2markdown1.html hsmarkdown1.html PANDOC_PATH ?= $(dir $(shell which pandoc)) MAKEPAGE = $(PANDOC_PATH)/pandoc -s -S -c pandoc.css -A footer.html all : $(ALL) |