git.iko.soy/typeable/pandoc
on master help sign in
+ Changes to osx/Welcome:

- removed hardcoded references to /usr/local - added title + Minor changes to website build process. git-svn-id: https://pandoc.googlecode.com/svn/trunk@84 788f1e2b-df1e-0410-8736-df70ead52e1b

commit30734c8d60405faed0f98fad88149efb86a05771 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateWed 8 Nov 2006, 17:27 (20 years ago) parent30405f3
3 files changed+19−11
compare with master
unifiedsplit
Makefile+2−1 osx/Welcome+10−5 web/index.txt+7−5
Makefile+2−1
@@ -315,7 +315,8 @@ $(web_dest)/: $(MAIN) html $(tarball_name)
315315 cp ../$(deb_main) $(web_dest)/; \
316316 cp $(tarball_name) $(web_dest)/; \
317317 cp $(web_src)/*.css $(web_dest)/; \
318− sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome > $(web_dest)/Welcome; \
318+ sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome | \
319+ $(make_page) > $(web_dest)/osx-notes.html; \
319320 sed -e 's/^/ /g' changelog | \
320321 $(make_page) > $(web_dest)/history.html; \
321322 $(make_page) README > $(web_dest)/README.html; \
osx/Welcome+10−5
@@ -1,13 +1,18 @@
1+% OS X Installation Notes
2+
13Pandoc will be installed into your `@PREFIX@` directory. In order
24to use `pandoc` and the associated wrapper scripts, you must have
3−`/usr/local/bin` in your `PATH.` To add `/usr/local/bin` to your
5+`@PREFIX@/bin` in your `PATH.` To add `@PREFIX@/bin` to your
46default path, add these lines to the end of `.profile` in your home
5−directory and open a new terminal window:
7+directory:
8+
9+ export PATH=$PATH:@PREFIX@/bin
10+ export MANPATH=$MANPATH:@PREFIX@/share/man
611
7− export PATH=$PATH:/usr/local/bin
8− export MANPATH=$MANPATH:/usr/local/share/man
12+You will have to open a new terminal window for these changes
13+to take effect.
914
1015To uninstall Pandoc at any time, use the following command:
1116
12− sudo /usr/local/bin/uninstall-pandoc
17+ sudo @PREFIX@/bin/uninstall-pandoc
1318
web/index.txt+7−5
@@ -22,18 +22,20 @@ To install, unpack the archive and follow the instructions in the
2222
2323**MacOS X binary package:** [`@OSX_DMG_NAME@`](@OSX_DMG_NAME@).
2424To install, just double-click the package icon in the disk
25−image. See the [installation notes](Welcome) for important
26−information about setting your `PATH`.
25+image. See the [installation notes](osx-notes.html) for important
26+information about setting your `PATH`. Note: This package was
27+compiled on a G4 Mac; it will work on an Intel Mac via emulation.
2728
2829**Debian binary package:** [`@DEB_NAME@`](@DEB_NAME@).
29−To install (on x86 Debian-based linux systems only), run `dpkg -i
30−@DEB_NAME@` as root.
30+To install (on x86 Debian-based linux systems only):
31+
32+ sudo dpkg -i @DEB_NAME@
3133
3234**Repository:** Pandoc has a publicly accesible subversion repository
3335at Google Code (<http://code.google.com/p/pandoc>). To check out the
3436latest, bleeding-edge source code:
3537
36− svn checkout http://pandoc.googlecode.com/svn/trunk/ pandoc
38+ svn checkout http://pandoc.googlecode.com/svn/trunk/ pandoc
3739
3840**Bugs:** You may view existing bug reports and submit new ones at
3941<http://code.google.com/p/pandoc/issues/list>.