diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | osx/Welcome | 15 | ||||
| -rw-r--r-- | web/index.txt | 12 |
3 files changed, 19 insertions, 11 deletions
@@ -315,7 +315,8 @@ $(web_dest)/: $(MAIN) html $(tarball_name) cp ../$(deb_main) $(web_dest)/; \ cp $(tarball_name) $(web_dest)/; \ cp $(web_src)/*.css $(web_dest)/; \ - sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome > $(web_dest)/Welcome; \ + sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome | \ + $(make_page) > $(web_dest)/osx-notes.html; \ sed -e 's/^/ /g' changelog | \ $(make_page) > $(web_dest)/history.html; \ $(make_page) README > $(web_dest)/README.html; \ diff --git a/osx/Welcome b/osx/Welcome index 5b075ac50..4733cb347 100644 --- a/osx/Welcome +++ b/osx/Welcome @@ -1,13 +1,18 @@ +% OS X Installation Notes + Pandoc will be installed into your `@PREFIX@` directory. In order to use `pandoc` and the associated wrapper scripts, you must have -`/usr/local/bin` in your `PATH.` To add `/usr/local/bin` to your +`@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 and open a new terminal window: +directory: + + export PATH=$PATH:@PREFIX@/bin + export MANPATH=$MANPATH:@PREFIX@/share/man - export PATH=$PATH:/usr/local/bin - export MANPATH=$MANPATH:/usr/local/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 /usr/local/bin/uninstall-pandoc + sudo @PREFIX@/bin/uninstall-pandoc diff --git a/web/index.txt b/web/index.txt index 8626b1854..f660070ba 100644 --- a/web/index.txt +++ b/web/index.txt @@ -22,18 +22,20 @@ To install, unpack the archive and follow the instructions in the **MacOS X binary package:** [`@OSX_DMG_NAME@`](@OSX_DMG_NAME@). To install, just double-click the package icon in the disk -image. See the [installation notes](Welcome) for important -information about setting your `PATH`. +image. See the [installation notes](osx-notes.html) for important +information about setting your `PATH`. Note: This package was +compiled on a G4 Mac; it will work on an Intel Mac via emulation. **Debian binary package:** [`@DEB_NAME@`](@DEB_NAME@). -To install (on x86 Debian-based linux systems only), run `dpkg -i -@DEB_NAME@` as root. +To install (on x86 Debian-based linux systems only): + + sudo dpkg -i @DEB_NAME@ **Repository:** Pandoc has a publicly accesible subversion repository at Google Code (<http://code.google.com/p/pandoc>). To check out the latest, bleeding-edge source code: - svn checkout http://pandoc.googlecode.com/svn/trunk/ pandoc + svn checkout http://pandoc.googlecode.com/svn/trunk/ pandoc **Bugs:** You may view existing bug reports and submit new ones at <http://code.google.com/p/pandoc/issues/list>. |