Changeset 21379 for main/trunk/greenstone2/win32.mak

Timestamp:

2009-12-18T15:15:39+13:00 (13 years ago)

Author:

ak19

Message:

The win32.mak of gs2build and greenstone2 are the same, so that they can just be obtained from one source in future.

File:

• main/trunk/greenstone2/win32.mak (modified) (5 diffs)

main/trunk/greenstone2/win32.mak

@@ -27 +27 @@
 GSDLHOME = $(MAKEDIR)
 GSDL_VC4 = 0
+# It only ever makes sense for GS2 to turn on LOCAL_LIBRARY and APACHE_HTTPD if needed
 LOCAL_LIBRARY = 0
 APACHE_HTTPD = 0
@@ -32 +33 @@
 DLL = 0
 DLLDEBUG = 0
+# USE_SQLITE is enabled by default for GS2. Need to turn off explicitly for GS3 in build.xml
 USE_SQLITE = 1
+# It only ever makes sense for GS2 to turn on MSSQL if needed
 USE_MSSQL = 0
 USE_Z3950 = 0
@@ -40 +43 @@
 ENABLE_MGPP = 1
 ENABLE_LUCENE = 1
-# jni is disabled by default as this is the default for GS2
+# jni is disabled by default as this is the default for GS2. GS3 will set this explicitly
 ENABLE_JNI = 0
 
@@ -46 +49 @@
 MDEFINES = /f win32.mak
 
-INSTALLDIRS = common-src build-src runtime-src 
+INSTALLDIRS = common-src build-src
+!IF EXIST ("runtime-src")
+INSTALLDIRS = $(INSTALLDIRS) runtime-src 
+!ENDIF
 
 
@@ -114 +120 @@
     $(MAKECLEANCMD)
     cd "$(GSDLHOME)"
+!IF EXIST ("runtime-src")
     cd runtime-src
     $(MAKECLEANCMD)
     cd "$(GSDLHOME)"
+!ENDIF
 
 $(INSTALLDIRS): FORCE