git.iko.soy/typeable/pandoc
on master help sign in
Removed osx-package specific files, and references to them

in Makefiles. git-svn-id: https://pandoc.googlecode.com/svn/trunk@906 788f1e2b-df1e-0410-8736-df70ead52e1b

commit71b70418f68eef7c5b9214fb1f5989b51c70b9e3 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSun 26 Aug 2007, 15:46 (19 years ago) parentbdb55ed
6 files changed+2−125
compare with master
unifiedsplit
Makefile+1−3 osx/Description.plist−10 osx/Info.plist−42 osx/Welcome−26 osx/uninstall-pandoc−43 web/Makefile+1−1
Makefile+1−3
@@ -336,7 +336,7 @@ make_page:=./$(MAIN) -s -S -B $(web_src)/header.html \
336336 -A $(web_src)/footer.html \
337337 -H $(web_src)/css
338338cleanup_files+=$(web_dest)
339−$(web_dest) : html $(wildcard $(web_src)/*) $(osx_src)/Welcome changelog \
339+$(web_dest) : html $(wildcard $(web_src)/*) changelog \
340340 INSTALL $(MANPAGES) $(MANDIR)/man1/pandoc.1.md README
341341 -rm -rf $(web_dest)
342342 ( \
@@ -345,8 +345,6 @@ $(web_dest) : html $(wildcard $(web_src)/*) $(osx_src)/Welcome changelog \
345345 cp $(web_src)/* $(web_dest)/; \
346346 sed -e 's#@VERSION@#$(VERSION)#g' $(web_src)/index.txt.in > \
347347 $(web_dest)/index.txt; \
348− sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome > \
349− $(web_dest)/osx-notes.txt; \
350348 cp changelog $(web_dest)/ ; \
351349 cp README $(web_dest)/ ; \
352350 cp INSTALL $(web_dest)/ ; \
osx/Description.plistdeleted−10
@@ -1,10 +0,0 @@
1−<?xml version="1.0" encoding="UTF-8"?>
2−<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3−<plist version="1.0">
4−<dict>
5− <key>IFPkgDescriptionDescription</key>
6− <string></string>
7− <key>IFPkgDescriptionTitle</key>
8− <string>Pandoc</string>
9−</dict>
10−</plist>
osx/Info.plistdeleted−42
@@ -1,42 +0,0 @@
1−<?xml version="1.0" encoding="UTF-8"?>
2−<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3−<plist version="1.0">
4−<dict>
5− <key>CFBundleGetInfoString</key>
6− <string>@VERSION@, (c) 2006 John MacFarlane (released under GPL)</string>
7− <key>CFBundleIdentifier</key>
8− <string>pandoc</string>
9− <key>CFBundleShortVersionString</key>
10− <string>@VERSION@</string>
11− <key>IFPkgFlagAllowBackRev</key>
12− <false/>
13− <key>IFPkgFlagAuthorizationAction</key>
14− <string>RootAuthorization</string>
15− <key>IFPkgFlagBackgroundAlignment</key>
16− <string>topleft</string>
17− <key>IFPkgFlagBackgroundScaling</key>
18− <string>none</string>
19− <key>IFPkgFlagDefaultLocation</key>
20− <string>/</string>
21− <key>IFPkgFlagFollowLinks</key>
22− <true/>
23− <key>IFPkgFlagInstallFat</key>
24− <false/>
25− <key>IFPkgFlagInstalledSize</key>
26− <integer>1788</integer>
27− <key>IFPkgFlagIsRequired</key>
28− <false/>
29− <key>IFPkgFlagOverwritePermissions</key>
30− <false/>
31− <key>IFPkgFlagRelocatable</key>
32− <false/>
33− <key>IFPkgFlagRestartAction</key>
34− <string>NoRestart</string>
35− <key>IFPkgFlagRootVolumeOnly</key>
36− <false/>
37− <key>IFPkgFlagUpdateInstalledLanguages</key>
38− <false/>
39− <key>IFPkgFormatVersion</key>
40− <real>0.10000000149011612</real>
41−</dict>
42−</plist>
osx/Welcomedeleted−26
@@ -1,26 +0,0 @@
1−% OS X Installation Notes
2−
3−**Important:** Pandoc requires that `GMP.framework` be installed
4−on your system. You can obtain it from
5−
6−> <http://www.haskell.org/ghc/dist/mac_frameworks/GMP-framework.zip>.
7−
8−To install, just unzip and drag the `GMP-framework` directory into your
9−`/Library/Frameworks` directory.
10−
11−Pandoc will be installed into your `@PREFIX@` directory. In order
12−to use `pandoc` and the associated wrapper scripts, you must have
13−`@PREFIX@/bin` in your `PATH.` To add `@PREFIX@/bin` to your
14−default path, add these lines to the end of `.profile` in your home
15−directory:
16−
17− export PATH=$PATH:@PREFIX@/bin
18− export MANPATH=$MANPATH:@PREFIX@/share/man
19−
20−You will have to open a new terminal window for these changes
21−to take effect.
22−
23−To uninstall Pandoc at any time, use the following command:
24−
25− sudo @PREFIX@/bin/uninstall-pandoc
26−
osx/uninstall-pandocdeleted−43
@@ -1,43 +0,0 @@
1−#!/bin/sh -e
2−# This script (when run with root permissions) uninstalls
3−# everything installed by the Pandoc Mac OS X installer.
4−
5−if [ "`id -u`" != 0 ]; then \
6− echo "This script must be run with root privileges:"; \
7− echo "sudo /usr/local/bin/uninstall-pandoc"; \
8− exit 1; \
9−fi
10−
11−MAN_PAGES="pandoc.1 markdown2pdf.1 html2markdown.1 hsmarkdown.1"
12−EXECUTABLES=`echo $MAN_PAGES | sed -e 's#\.1##g'`
13−EXECUTABLES="$EXECUTABLES uninstall-pandoc"
14−DOCUMENTS="`ls /usr/local/share/doc/pandoc`"
15−TOREMOVE=""
16−for F in $EXECUTABLES; do
17− TOREMOVE="$TOREMOVE /usr/local/bin/$F";
18−done
19−for F in $MAN_PAGES; do
20− TOREMOVE="$TOREMOVE /usr/local/share/man/man1/$F";
21−done
22−for F in $DOCUMENTS; do
23− TOREMOVE="$TOREMOVE /usr/local/share/doc/pandoc/$F";
24−done
25−TOREMOVE="$TOREMOVE /usr/local/share/doc/pandoc"
26−
27−echo "This script will remove all of the files installed"
28−echo "by the Pandoc Mac OS X installer: $TOREMOVE"
29−echo "Are you sure you want to continue with this?"
30−
31−OPTIONS="Continue Quit"
32−select opt in $OPTIONS; do
33− if [ "$opt" = "Quit" ]; then
34− exit 0
35− elif [ "$opt" = "Continue" ]; then
36− echo "Removing..."
37− rm -rv $TOREMOVE
38− echo "Successfully removed Pandoc."
39− exit 0
40− else
41− echo "Bad option."
42− fi
43−done
web/Makefile+1−1
@@ -1,4 +1,4 @@
1−ALL := index.html osx-notes.html README.html INSTALL.html examples.html pandoc1.html markdown2pdf1.html html2markdown1.html hsmarkdown1.html
1+ALL := index.html README.html INSTALL.html examples.html pandoc1.html markdown2pdf1.html html2markdown1.html hsmarkdown1.html
22PANDOC_PATH ?= $(dir $(shell which pandoc))
33MAKEPAGE = $(PANDOC_PATH)/pandoc -s -S -c pandoc.css -A footer.html
44all : $(ALL)