From: Joey Hess Date: Mon, 18 Oct 2010 20:40:37 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/9b52fb16be4c5f569c31d339391c46264c6e43af?hp=31e23ddc514faba17bfeb213a6ecaafc806aae1b Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn index 50bb2f520..8b649156d 100644 --- a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -34,8 +34,12 @@ curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | su I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. I got an error on msgfmt. Turns out this is a program in gettext. I installed that and it fixed the error. +cd .. + git clone git://git.ikiwiki.info/ +cd git.ikiwiki.info/ + perl Makefile.PL LIB=/Library/Perl/5.10.0 make @@ -62,7 +66,7 @@ When you can't get into the setup page or you get strange behavior after a setup ## installing gitweb -cd gitweb +cd ../git-1.7.3.1/gitweb make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png"