Changeset 8201 for trunk/greenstone3-extensions

Timestamp:

2004-10-01T09:09:50+12:00 (20 years ago)

Author:

kjdon

Message:

added in the path to the mg stuff for greenstone

File:

• trunk/greenstone3-extensions/vishnu/src/vishnu/Makefile.in (modified) (3 diffs)

trunk/greenstone3-extensions/vishnu/src/vishnu/Makefile.in

@@ -36 +36 @@
 SERVLETCLASSDIR=$(prefix)/web/WEB-INF/classes/vishnu/server
 
+# this is to find the mg stuff when installing as part of Greenstone
+MYCLASSPATH=$(CLASSPATH):$(prefix)/packages/mg/java/org/greenstone/mg/classes
 VISHNUHOME=../../
 # the top level src directory
@@ -57 +59 @@
 
 compile: setup
-    $(JAVAC) -d $(JAVACLASSDIR) -sourcepath $(JAVASRCDIR) $(JAVACOPTIONS) */*.java */*/*.java */*/*/*.java
+    $(JAVAC) -classpath $(MYCLASSPATH) -d $(JAVACLASSDIR) -sourcepath $(JAVASRCDIR) $(JAVACOPTIONS) */*.java */*/*.java */*/*/*.java
     $(JAVAH) -classpath $(JAVACLASSDIR) -d $(JAVASRCDIR)/cluster vishnu.server.Cluster
     jar cf vishnu.jar -C $(JAVACLASSDIR) vishnu
@@ -64 +66 @@
     cp vishnu.jar $(JAVALIBDIR)/
     cp vishnu.jar $(WEBLIBDIR)/
-    cp $(JAVACLASSDIR)/vishnu/server/VisServlet.class $(SERVLETCLASSDIR)/
-    cp vishnu.jar $(VISHNUHOME)/lib
+    # uncomment the following if using vishnu outside of greenstone
+    #$(VISHNUHOME)/mkinstalldirs $(SERVLETCLASSDIR)
+    #$(VISHNUHOME)/mkinstalldirs $(VISHNUHOME)/lib
+    #cp $(JAVACLASSDIR)/vishnu/server/VisServlet.class $(SERVLETCLASSDIR)/
+    #cp vishnu.jar $(VISHNUHOME)/lib
 clean:
     rm -r vishnu.jar ./classes/*