(no commit message)

[ikiwiki.git] / doc / tips / ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn

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 05a9bf6d791087c47047cf7e5de5b6bea355256d..bb1db0cbba1b9424cb8b49de83bd42605e33c0f4 100644 (file)
--- 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,21 +66,31 @@ 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" 
+make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" GITWEB_JS="/gitweb.js"
 
 cp gitweb.cgi /Library/WebServer/CGI-Executables/
-cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/
-cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/
-cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/
-cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/
+
+cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/Documents/
+
+cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/Documents/
+
+cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/Documents/
+
+cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/Documents/
+
 
 sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi
-sudo chmod 2755 /Library/WebServer/git-favicon.png
-sudo chmod 2755 /Library/WebServer/git-logo.png
-sudo chmod 2755 /Library/WebServer/gitweb.css
-sudo chmod 2755 /Library/WebServer/gitweb.js
+
+sudo chmod 2755 /Library/WebServer/Documents/git-favicon.png
+
+sudo chmod 2755 /Library/WebServer/Documents/git-logo.png
+
+sudo chmod 2755 /Library/WebServer/Documents/gitweb.css
+
+sudo chmod 2755 /Library/WebServer/Documents/gitweb.js
+
 
 ## installing xapian:
 
@@ -161,15 +175,10 @@ it installed without issue so I'm baffled why it didn't install from command lin
 
 ## turning on search plugin:
 
-I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "blah blah cgi-bin/omega/omega" does not exist or some such. I did a 
-
-find / -name "omega" -print
-
-and found the omega program in 
-
-/usr/local/lib/xapian-omega/bin/omega. 
+I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "Error: /usr/lib/cgi-bin/omega/omega failed: No such file or directory".
+I did a  "find / -name "omega" -print" and found the omega program in "/usr/local/lib/xapian-omega/bin/omega".
 
-Then I went into the setup file and replaced the bad path, updated and badda-boom badda-bing.
+Then I went into the 2wiki.setup file and replaced the bad path, updated and badda-boom badda-bing.