diff -Nur geneweb-5.00.orig/rpm/geneweb-initrc.sh geneweb-5.00/rpm/geneweb-initrc.sh
--- geneweb-5.00.orig/rpm/geneweb-initrc.sh	2005-12-13 04:51:26.000000000 -0700
+++ geneweb-5.00/rpm/geneweb-initrc.sh	2007-03-01 14:05:53.000000000 -0700
@@ -21,9 +21,9 @@
 	echo "Starting GeneWeb Services:"
         touch /var/log/gwd.log /var/log/gwsetup.log
         chown geneweb /var/log/gwd.log /var/log/gwsetup.log
-	mkdir -p /home/geneweb/bases
-	chmod a+rw /home/geneweb/bases
-	cd /home/geneweb/bases
+	mkdir -p /opt/geneweb/bases
+	chmod a+rw /opt/geneweb/bases
+	cd /opt/geneweb/bases
 	hd=../gw/gw
 	$hd/gwd -log /var/log/gwd.log -daemon -hd $hd -setup_link
 	$hd/gwsetup -daemon -gd $hd 2>> /var/log/gwsetup.log
@@ -31,7 +31,7 @@
 	;;
   stop)
 	echo -n "Shutting down GeneWeb Services: "
-	cd /home/geneweb/bases
+	cd /opt/geneweb/bases
 	hd=../gw/gw
 	killproc $hd/gwd
 	killproc $hd/gwsetup
@@ -43,8 +43,8 @@
 	;;
   restart)
 	echo -n "Restarting GeneWeb Services: "
-	mkdir -p /home/geneweb/bases
-	cd /home/geneweb/bases
+	mkdir -p /opt/geneweb/bases
+	cd /opt/geneweb/bases
 	hd=../gw/gw
         killproc $hd/gwd
         killproc $hd/gwsetup
diff -Nur geneweb-5.00.orig/tools/Makefile.inc geneweb-5.00/tools/Makefile.inc
--- geneweb-5.00.orig/tools/Makefile.inc	1969-12-31 17:00:00.000000000 -0700
+++ geneweb-5.00/tools/Makefile.inc	2006-12-12 13:31:53.000000000 -0700
@@ -0,0 +1,44 @@
+# $Id: Makefile.inc.unix,v 1.2 2006/12/12 20:31:53 ddr Exp $
+
+TOP=..
+CAMLP4_COMM=TOP=$(TOP) $(TOP)/tools/camlp4_comm.sh $(PPDEF)
+CAMLP4F=-DUNIX
+PPDEF=$(TOP)/src/ppdef.cmo
+CAMLP4D="$$(camlp4 -where)"
+LIBUNIX=-cclib -lunix
+OCAMLC=ocamlc.opt -warn-error A
+OCAMLOPT=ocamlopt.opt -warn-error A
+OCAMLI=
+OCAMLD=
+STRIP=strip
+RM=/bin/rm -f
+EXE=
+STATIC=-ccopt -static
+STATIC=
+TEST_DIR=test $$(basename "$<") = "$<" || { echo "Please run 'make' in directory '$$(dirname "$<")' first"; exit 1; }
+
+all::
+opt::
+
+clean::
+	$(RM) *.out *.opt *.cm[oixa] *.cmxa *.pp[oi] *.o *.a *.obj *.lib *.lck *.bak *~ .#* *.annot
+
+.SUFFIXES: .ml .cmo .mli .cmi .cmx
+
+.mli.cmi:
+	@$(TEST_DIR)
+	@$(CAMLP4_COMM) $(CAMLP4F) $< -o $*.ppi
+	$(OCAMLC) $(OCAMLI) -I $(CAMLP4D) -c -intf $*.ppi
+	$(RM) $*.ppi
+
+.ml.cmo:
+	@$(TEST_DIR)
+	@$(CAMLP4_COMM) $(CAMLP4F) $< -o $*.ppo
+	$(OCAMLC) $(OCAMLI) $(OCAMLD) -I $(CAMLP4D) -c -impl $*.ppo
+	$(RM) $*.ppo
+
+.ml.cmx:
+	@$(TEST_DIR)
+	@$(CAMLP4_COMM) $(CAMLP4F) $< -o $*.ppo
+	$(OCAMLOPT) $(OCAMLI) -I $(CAMLP4D) -c -impl $*.ppo
+	$(RM) $*.ppo
diff -Nur geneweb-5.00.orig/tools/Makefile.inc.unix geneweb-5.00/tools/Makefile.inc.unix
--- geneweb-5.00.orig/tools/Makefile.inc.unix	2006-12-12 13:31:53.000000000 -0700
+++ geneweb-5.00/tools/Makefile.inc.unix	1969-12-31 17:00:00.000000000 -0700
@@ -1,44 +0,0 @@
-# $Id: Makefile.inc.unix,v 1.2 2006/12/12 20:31:53 ddr Exp $
-
-TOP=..
-CAMLP4_COMM=TOP=$(TOP) $(TOP)/tools/camlp4_comm.sh $(PPDEF)
-CAMLP4F=-DUNIX
-PPDEF=$(TOP)/src/ppdef.cmo
-CAMLP4D="$$(camlp4 -where)"
-LIBUNIX=-cclib -lunix
-OCAMLC=ocamlc.opt -warn-error A
-OCAMLOPT=ocamlopt.opt -warn-error A
-OCAMLI=
-OCAMLD=
-STRIP=strip
-RM=/bin/rm -f
-EXE=
-STATIC=-ccopt -static
-STATIC=
-TEST_DIR=test $$(basename "$<") = "$<" || { echo "Please run 'make' in directory '$$(dirname "$<")' first"; exit 1; }
-
-all::
-opt::
-
-clean::
-	$(RM) *.out *.opt *.cm[oixa] *.cmxa *.pp[oi] *.o *.a *.obj *.lib *.lck *.bak *~ .#* *.annot
-
-.SUFFIXES: .ml .cmo .mli .cmi .cmx
-
-.mli.cmi:
-	@$(TEST_DIR)
-	@$(CAMLP4_COMM) $(CAMLP4F) $< -o $*.ppi
-	$(OCAMLC) $(OCAMLI) -I $(CAMLP4D) -c -intf $*.ppi
-	$(RM) $*.ppi
-
-.ml.cmo:
-	@$(TEST_DIR)
-	@$(CAMLP4_COMM) $(CAMLP4F) $< -o $*.ppo
-	$(OCAMLC) $(OCAMLI) $(OCAMLD) -I $(CAMLP4D) -c -impl $*.ppo
-	$(RM) $*.ppo
-
-.ml.cmx:
-	@$(TEST_DIR)
-	@$(CAMLP4_COMM) $(CAMLP4F) $< -o $*.ppo
-	$(OCAMLOPT) $(OCAMLI) -I $(CAMLP4D) -c -impl $*.ppo
-	$(RM) $*.ppo