geneweb/contribs9/geneweb-6.08-init.patch

diff -ruN geneweb-6.08/rpm/geneweb-initrc.sh geneweb-6.08-a/rpm/geneweb-initrc.sh
--- geneweb-6.08/rpm/geneweb-initrc.sh  2015-05-07 13:42:44.000000000 +0400
+++ geneweb-6.08-a/rpm/geneweb-initrc.sh        2015-05-26 20:03:50.129426431 +0400
@@ -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 -ruN geneweb-6.08/tools/Makefile.inc.unix geneweb-6.08-a/tools/Makefile.inc.unix
--- geneweb-6.08/tools/Makefile.inc.unix        2015-05-07 13:42:44.000000000 +0400
+++ geneweb-6.08-a/tools/Makefile.inc.unix      2015-05-26 20:03:50.129426431 +0400
@@ -3,10 +3,10 @@
 TOP=..
 CAMLP5_COMM=TOP=$(TOP) $(TOP)/tools/camlp5_comm.sh
 CAMLP5F=-DUNIX
-CAMLP5D=+camlp5
+CAMLP5D=/usr/local/lib/ocaml/camlp5
 LIBUNIX=-cclib -lunix
-OCAMLC=ocamlc.opt -warn-error A
-OCAMLOPT=ocamlopt.opt -warn-error A
+OCAMLC=ocamlc -warn-error A
+OCAMLOPT=ocamlopt -warn-error A
 OCAMLI=
 OCAMLD=
 STRIP=strip
1	diff -ruN geneweb-6.08/rpm/geneweb-initrc.sh geneweb-6.08-a/rpm/geneweb-initrc.sh
2	--- geneweb-6.08/rpm/geneweb-initrc.sh 2015-05-07 13:42:44.000000000 +0400
3	+++ geneweb-6.08-a/rpm/geneweb-initrc.sh 2015-05-26 20:03:50.129426431 +0400
4	@@ -21,9 +21,9 @@
5	echo "Starting GeneWeb Services:"
6	touch /var/log/gwd.log /var/log/gwsetup.log
7	chown geneweb /var/log/gwd.log /var/log/gwsetup.log
8	- mkdir -p /home/geneweb/bases
9	- chmod a+rw /home/geneweb/bases
10	- cd /home/geneweb/bases
11	+ mkdir -p /opt/geneweb/bases
12	+ chmod a+rw /opt/geneweb/bases
13	+ cd /opt/geneweb/bases
14	hd=../gw/gw
15	$hd/gwd -log /var/log/gwd.log -daemon -hd $hd -setup_link
16	$hd/gwsetup -daemon -gd $hd 2>> /var/log/gwsetup.log
17	@@ -31,7 +31,7 @@
18	;;
19	stop)
20	echo -n "Shutting down GeneWeb Services: "
21	- cd /home/geneweb/bases
22	+ cd /opt/geneweb/bases
23	hd=../gw/gw
24	killproc $hd/gwd
25	killproc $hd/gwsetup
26	@@ -43,8 +43,8 @@
27	;;
28	restart)
29	echo -n "Restarting GeneWeb Services: "
30	- mkdir -p /home/geneweb/bases
31	- cd /home/geneweb/bases
32	+ mkdir -p /opt/geneweb/bases
33	+ cd /opt/geneweb/bases
34	hd=../gw/gw
35	killproc $hd/gwd
36	killproc $hd/gwsetup
37	diff -ruN geneweb-6.08/tools/Makefile.inc.unix geneweb-6.08-a/tools/Makefile.inc.unix
38	--- geneweb-6.08/tools/Makefile.inc.unix 2015-05-07 13:42:44.000000000 +0400
39	+++ geneweb-6.08-a/tools/Makefile.inc.unix 2015-05-26 20:03:50.129426431 +0400
40	@@ -3,10 +3,10 @@
41	TOP=..
42	CAMLP5_COMM=TOP=$(TOP) $(TOP)/tools/camlp5_comm.sh
43	CAMLP5F=-DUNIX
44	-CAMLP5D=+camlp5
45	+CAMLP5D=/usr/local/lib/ocaml/camlp5
46	LIBUNIX=-cclib -lunix
47	-OCAMLC=ocamlc.opt -warn-error A
48	-OCAMLOPT=ocamlopt.opt -warn-error A
49	+OCAMLC=ocamlc -warn-error A
50	+OCAMLOPT=ocamlopt -warn-error A
51	OCAMLI=
52	OCAMLD=
53	STRIP=strip