| 1 |
slords |
1.1 |
diff -Nur geneweb-5.00.orig/rpm/geneweb-initrc.sh geneweb-5.00/rpm/geneweb-initrc.sh |
| 2 |
|
|
--- geneweb-5.00.orig/rpm/geneweb-initrc.sh 2005-12-13 04:51:26.000000000 -0700 |
| 3 |
|
|
+++ geneweb-5.00/rpm/geneweb-initrc.sh 2007-03-01 14:05:53.000000000 -0700 |
| 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 -Nur geneweb-5.00.orig/tools/Makefile.inc geneweb-5.00/tools/Makefile.inc |
| 38 |
|
|
--- geneweb-5.00.orig/tools/Makefile.inc 1969-12-31 17:00:00.000000000 -0700 |
| 39 |
|
|
+++ geneweb-5.00/tools/Makefile.inc 2006-12-12 13:31:53.000000000 -0700 |
| 40 |
|
|
@@ -0,0 +1,44 @@ |
| 41 |
|
|
+# $Id: Makefile.inc.unix,v 1.2 2006/12/12 20:31:53 ddr Exp $ |
| 42 |
|
|
+ |
| 43 |
|
|
+TOP=.. |
| 44 |
|
|
+CAMLP4_COMM=TOP=$(TOP) $(TOP)/tools/camlp4_comm.sh $(PPDEF) |
| 45 |
|
|
+CAMLP4F=-DUNIX |
| 46 |
|
|
+PPDEF=$(TOP)/src/ppdef.cmo |
| 47 |
|
|
+CAMLP4D="$$(camlp4 -where)" |
| 48 |
|
|
+LIBUNIX=-cclib -lunix |
| 49 |
|
|
+OCAMLC=ocamlc.opt -warn-error A |
| 50 |
|
|
+OCAMLOPT=ocamlopt.opt -warn-error A |
| 51 |
|
|
+OCAMLI= |
| 52 |
|
|
+OCAMLD= |
| 53 |
|
|
+STRIP=strip |
| 54 |
|
|
+RM=/bin/rm -f |
| 55 |
|
|
+EXE= |
| 56 |
|
|
+STATIC=-ccopt -static |
| 57 |
|
|
+STATIC= |
| 58 |
|
|
+TEST_DIR=test $$(basename "$<") = "$<" || { echo "Please run 'make' in directory '$$(dirname "$<")' first"; exit 1; } |
| 59 |
|
|
+ |
| 60 |
|
|
+all:: |
| 61 |
|
|
+opt:: |
| 62 |
|
|
+ |
| 63 |
|
|
+clean:: |
| 64 |
|
|
+ $(RM) *.out *.opt *.cm[oixa] *.cmxa *.pp[oi] *.o *.a *.obj *.lib *.lck *.bak *~ .#* *.annot |
| 65 |
|
|
+ |
| 66 |
|
|
+.SUFFIXES: .ml .cmo .mli .cmi .cmx |
| 67 |
|
|
+ |
| 68 |
|
|
+.mli.cmi: |
| 69 |
|
|
+ @$(TEST_DIR) |
| 70 |
|
|
+ @$(CAMLP4_COMM) $(CAMLP4F) $< -o $*.ppi |
| 71 |
|
|
+ $(OCAMLC) $(OCAMLI) -I $(CAMLP4D) -c -intf $*.ppi |
| 72 |
|
|
+ $(RM) $*.ppi |
| 73 |
|
|
+ |
| 74 |
|
|
+.ml.cmo: |
| 75 |
|
|
+ @$(TEST_DIR) |
| 76 |
|
|
+ @$(CAMLP4_COMM) $(CAMLP4F) $< -o $*.ppo |
| 77 |
|
|
+ $(OCAMLC) $(OCAMLI) $(OCAMLD) -I $(CAMLP4D) -c -impl $*.ppo |
| 78 |
|
|
+ $(RM) $*.ppo |
| 79 |
|
|
+ |
| 80 |
|
|
+.ml.cmx: |
| 81 |
|
|
+ @$(TEST_DIR) |
| 82 |
|
|
+ @$(CAMLP4_COMM) $(CAMLP4F) $< -o $*.ppo |
| 83 |
|
|
+ $(OCAMLOPT) $(OCAMLI) -I $(CAMLP4D) -c -impl $*.ppo |
| 84 |
|
|
+ $(RM) $*.ppo |
| 85 |
|
|
diff -Nur geneweb-5.00.orig/tools/Makefile.inc.unix geneweb-5.00/tools/Makefile.inc.unix |
| 86 |
|
|
--- geneweb-5.00.orig/tools/Makefile.inc.unix 2006-12-12 13:31:53.000000000 -0700 |
| 87 |
|
|
+++ geneweb-5.00/tools/Makefile.inc.unix 1969-12-31 17:00:00.000000000 -0700 |
| 88 |
|
|
@@ -1,44 +0,0 @@ |
| 89 |
|
|
-# $Id: Makefile.inc.unix,v 1.2 2006/12/12 20:31:53 ddr Exp $ |
| 90 |
|
|
- |
| 91 |
|
|
-TOP=.. |
| 92 |
|
|
-CAMLP4_COMM=TOP=$(TOP) $(TOP)/tools/camlp4_comm.sh $(PPDEF) |
| 93 |
|
|
-CAMLP4F=-DUNIX |
| 94 |
|
|
-PPDEF=$(TOP)/src/ppdef.cmo |
| 95 |
|
|
-CAMLP4D="$$(camlp4 -where)" |
| 96 |
|
|
-LIBUNIX=-cclib -lunix |
| 97 |
|
|
-OCAMLC=ocamlc.opt -warn-error A |
| 98 |
|
|
-OCAMLOPT=ocamlopt.opt -warn-error A |
| 99 |
|
|
-OCAMLI= |
| 100 |
|
|
-OCAMLD= |
| 101 |
|
|
-STRIP=strip |
| 102 |
|
|
-RM=/bin/rm -f |
| 103 |
|
|
-EXE= |
| 104 |
|
|
-STATIC=-ccopt -static |
| 105 |
|
|
-STATIC= |
| 106 |
|
|
-TEST_DIR=test $$(basename "$<") = "$<" || { echo "Please run 'make' in directory '$$(dirname "$<")' first"; exit 1; } |
| 107 |
|
|
- |
| 108 |
|
|
-all:: |
| 109 |
|
|
-opt:: |
| 110 |
|
|
- |
| 111 |
|
|
-clean:: |
| 112 |
|
|
- $(RM) *.out *.opt *.cm[oixa] *.cmxa *.pp[oi] *.o *.a *.obj *.lib *.lck *.bak *~ .#* *.annot |
| 113 |
|
|
- |
| 114 |
|
|
-.SUFFIXES: .ml .cmo .mli .cmi .cmx |
| 115 |
|
|
- |
| 116 |
|
|
-.mli.cmi: |
| 117 |
|
|
- @$(TEST_DIR) |
| 118 |
|
|
- @$(CAMLP4_COMM) $(CAMLP4F) $< -o $*.ppi |
| 119 |
|
|
- $(OCAMLC) $(OCAMLI) -I $(CAMLP4D) -c -intf $*.ppi |
| 120 |
|
|
- $(RM) $*.ppi |
| 121 |
|
|
- |
| 122 |
|
|
-.ml.cmo: |
| 123 |
|
|
- @$(TEST_DIR) |
| 124 |
|
|
- @$(CAMLP4_COMM) $(CAMLP4F) $< -o $*.ppo |
| 125 |
|
|
- $(OCAMLC) $(OCAMLI) $(OCAMLD) -I $(CAMLP4D) -c -impl $*.ppo |
| 126 |
|
|
- $(RM) $*.ppo |
| 127 |
|
|
- |
| 128 |
|
|
-.ml.cmx: |
| 129 |
|
|
- @$(TEST_DIR) |
| 130 |
|
|
- @$(CAMLP4_COMM) $(CAMLP4F) $< -o $*.ppo |
| 131 |
|
|
- $(OCAMLOPT) $(OCAMLI) -I $(CAMLP4D) -c -impl $*.ppo |
| 132 |
|
|
- $(RM) $*.ppo |
Parent Directory
| 
Revision Log
| 
Revision Graph
