Added uninstall-pandoc script to Mac OS X package.

Added information about uninstalling to Welcome message.


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

4 files changed, 6 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 3635addfe..425757db9 100644
--- a/Makefile
+++ b/Makefile
@@ -174,6 +174,7 @@ $(osx_dest): $(doc_more) $(BINS)
 	-rm -rf $(osx_dest)
 	$(INSTALL) -d $(osx_dest)
 	DESTDIR=$(osx_dest)/Package_root $(MAKE) install-program
+	cp $(osx_src)/uninstall-pandoc $(osx_dest)/Package_root/usr/local/bin/
 	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
diff --git a/TODO b/TODO
index 97197918a..6555d6c59 100644
--- a/TODO
+++ b/TODO
@@ -21,7 +21,6 @@
 >
 >      -- Recai Oktaş <roktas@debian.org>  Tue, 24 Oct 2006 07:48:30 +0300
 
-- uninstall script in Mac package; add information about it to Welcome?
 - look into warnings on pdflatex concerning ucs packages
 - change all versions to 0.3
 
diff --git a/osx/Welcome b/osx/Welcome
index 61e145868..3acc7efd7 100644
--- a/osx/Welcome
+++ b/osx/Welcome
@@ -7,3 +7,7 @@ directory and open a new terminal window:
     export PATH=/usr/local/bin:$PATH
     export MANPATH=/usr/local/man:$MANPATH
 
+To uninstall Pandoc at any time, use the following command:
+
+    sudo /usr/local/bin/uninstall-pandoc
+
diff --git a/osx/uninstall-pandoc b/osx/uninstall-pandoc
index 0ccf7990e..57b8f9e65 100755
--- a/osx/uninstall-pandoc
+++ b/osx/uninstall-pandoc
@@ -12,9 +12,9 @@ if [ "`id -u`" != 0 ]; then \
 	exit 0; \
 fi
 
-
 MAN_PAGES="pandoc.1 markdown2html.1 markdown2latex.1 html2markdown.1 latex2markdown.1 markdown2pdf.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