Changeset 16577 for gsdl/trunk/common-src

Timestamp:

2008-07-29T12:05:44+12:00 (16 years ago)

Author:

davidb

Message:

Minor tweaks to windows make files

Location:

gsdl/trunk/common-src

Files:

• src/lib/gsdlconf.h (modified) (1 diff)
• src/lib/win32.mak (modified) (1 diff)
• win32.mak (modified) (6 diffs)

gsdl/trunk/common-src/src/lib/gsdlconf.h

@@ -37 +37 @@
 
 #if defined(__WIN32__) && !defined(__CYGWIN__)
-#include "../../win32cfg.h"
+#include "../../../win32cfg.h"
 #else
-#include "../../config.h"
+#include "../../../config.h"
 #endif
 

gsdl/trunk/common-src/src/lib/win32.mak

@@ -25 +25 @@
 ###########################################################################
 
-GSDL_DIR = ..\..
-INDEXERS_DIR = $(GSDL_DIR)\indexers
-PACKAGES_DIR = $(GSDL_DIR)\packages
+GSDL_DIR = ..\..\..
+INDEXERS_DIR = $(GSDL_DIR)\common-src\indexers
+PACKAGES_DIR = $(GSDL_DIR)\common-src\packages
 
 

gsdl/trunk/common-src/win32.mak

@@ -68 +68 @@
 
 clean:
+    cd "$(COMMONHOME)"
     cd packages\windows\crypt\crypt
     $(MAKECLEANCMD)
@@ -91 +92 @@
 
 $(COMPILEDIRS): FORCE
+    cd "$(COMMONHOME)"
     cd "$@"
     $(MAKECMD)
@@ -96 +98 @@
 
 $(INSTALLDIRS): FORCE
+    cd "$(COMMONHOME)"
     cd "$@"
     $(MAKECMD)
@@ -102 +105 @@
 
 $(SQLITE_DIR): FORCE
+    cd "$(COMMONHOME)"
     cd "$@"
     $(MAKECMD)
@@ -108 +112 @@
 
 $(INDEXERSDIR): FORCE
+    cd "$(COMMONHOME)"
     cd "$@"
     call winMake.bat all gs2
@@ -115 +120 @@
     for %%i in (bin\*.exe) do \
       copy %%i "$(GSDLHOME)\bin\windows"
-    copy lucene-gs\LuceneWrapper.jar "$(GSDLHOME)\bin\java"
+    if EXIST "lucene-gs\LuceneWrapper.jar" copy "lucene-gs\LuceneWrapper.jar" "$(GSDLHOME)\bin\java"
+    if NOT EXIST "lucene-gs\LuceneWrapper.jar" echo Warning: Failed to find lucene-gs\LuceneWrapper.jar.  Greenstone will not be able to use Lucene for indexing
     cd "$(GSDLHOME)"