git.iko.soy/typeable/pandoc
on master help sign in
+ Changes to osx/Welcome:
30734c8fiddlosopher
Makefile+2−1
compare with master
unifiedsplit
@@ -315,7 +315,8 @@ $(web_dest)/: $(MAIN) html $(tarball_name)
315 cp ../$(deb_main) $(web_dest)/; \
315 cp ../$(deb_main) $(web_dest)/; \
316 cp $(tarball_name) $(web_dest)/; \
316 cp $(tarball_name) $(web_dest)/; \
317 cp $(web_src)/*.css $(web_dest)/; \
317 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; \
319 sed -e 's/^/ /g' changelog | \
320 sed -e 's/^/ /g' changelog | \
320 $(make_page) > $(web_dest)/history.html; \
321 $(make_page) > $(web_dest)/history.html; \
321 $(make_page) README > $(web_dest)/README.html; \
322 $(make_page) README > $(web_dest)/README.html; \
osx/Welcome+10−5
@@ -1,13 +1,18 @@
1+% OS X Installation Notes
2+
1Pandoc will be installed into your `@PREFIX@` directory. In order
3Pandoc will be installed into your `@PREFIX@` directory. In order
2to use `pandoc` and the associated wrapper scripts, you must have
4to 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
4default path, add these lines to the end of `.profile` in your home
6default 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
6
11
7− export PATH=$PATH:/usr/local/bin
12+You will have to open a new terminal window for these changes
8− export MANPATH=$MANPATH:/usr/local/share/man
13+to take effect.
9
14
10To uninstall Pandoc at any time, use the following command:
15To uninstall Pandoc at any time, use the following command:
11
16
12− sudo /usr/local/bin/uninstall-pandoc
17+ sudo @PREFIX@/bin/uninstall-pandoc
13
18
web/index.txt+7−5
@@ -22,18 +22,20 @@ To install, unpack the archive and follow the instructions in the
22
22
23**MacOS X binary package:** [`@OSX_DMG_NAME@`](@OSX_DMG_NAME@).
23**MacOS X binary package:** [`@OSX_DMG_NAME@`](@OSX_DMG_NAME@).
24To install, just double-click the package icon in the disk
24To install, just double-click the package icon in the disk
25−image. See the [installation notes](Welcome) for important
25+image. See the [installation notes](osx-notes.html) for important
26−information about setting your `PATH`.
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.
27
28
28**Debian binary package:** [`@DEB_NAME@`](@DEB_NAME@).
29**Debian binary package:** [`@DEB_NAME@`](@DEB_NAME@).
29−To install (on x86 Debian-based linux systems only), run `dpkg -i
30+To install (on x86 Debian-based linux systems only):
31+
30−@DEB_NAME@` as root.
32+ sudo dpkg -i @DEB_NAME@
31
33
32**Repository:** Pandoc has a publicly accesible subversion repository
34**Repository:** Pandoc has a publicly accesible subversion repository
33at Google Code (<http://code.google.com/p/pandoc>). To check out the
35at Google Code (<http://code.google.com/p/pandoc>). To check out the
34latest, bleeding-edge source code:
36latest, bleeding-edge source code:
35
37
36− svn checkout http://pandoc.googlecode.com/svn/trunk/ pandoc
38+ svn checkout http://pandoc.googlecode.com/svn/trunk/ pandoc
37
39
38**Bugs:** You may view existing bug reports and submit new ones at
40**Bugs:** You may view existing bug reports and submit new ones at
39<http://code.google.com/p/pandoc/issues/list>.
41<http://code.google.com/p/pandoc/issues/list>.