From 30405f3764615f60dd63488d9b9a97e23b7c19a9 Mon Sep 17 00:00:00 2001
From: fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>
Date: Wed, 8 Nov 2006 15:47:54 +0000
Subject: [PATCH] Revisions to website target: + added link for OSX package +
minor fixes
git-svn-id: https://pandoc.googlecode.com/svn/trunk@83 788f1e2b-df1e-0410-8736-df70ead52e1b
---
Makefile | 5 ++++-
web/index.txt | 9 +++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index d9b4477cd..b1a3e0113 100644
--- a/Makefile
+++ b/Makefile
@@ -315,11 +315,14 @@ $(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/^/ /g' changelog | \
+ $(make_page) > $(web_dest)/history.html; \
$(make_page) README > $(web_dest)/README.html; \
$(make_page) INSTALL > $(web_dest)/INSTALL.html; \
- $(make_page) changelog > $(web_dest)/history.html; \
sed -e 's/@TARBALL_NAME@/$(tarball_name)/g' $(web_src)/index.txt | \
sed -e 's/@DEB_NAME@/$(deb_main)/g' | \
+ sed -e 's/@OSX_DMG_NAME@/$(osx_dmg_name)/g' | \
$(make_page) > $(web_dest)/index.html; \
) || { rm -rf $(web_dest); exit 1; }
diff --git a/web/index.txt b/web/index.txt
index 2953a81f2..8626b1854 100644
--- a/web/index.txt
+++ b/web/index.txt
@@ -16,11 +16,16 @@ or output format requires only adding a reader or writer.
For more information, see the [README](README.html) file.
-**Source distribution:** [@TARBALL_NAME@](@TARBALL_NAME@).
+**Source distribution:** [`@TARBALL_NAME@`](@TARBALL_NAME@).
To install, unpack the archive and follow the instructions in the
[INSTALL](INSTALL.html) file. You'll need the [GHC] Haskell compiler.
-**Debian binary package:** [@DEB_NAME@](@DEB_NAME@).
+**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`.
+
+**Debian binary package:** [`@DEB_NAME@`](@DEB_NAME@).
To install (on x86 Debian-based linux systems only), run `dpkg -i
@DEB_NAME@` as root.