Changeset 21435 for main/trunk/greenstone2/runtime-src/win32.mak

Timestamp:

2010-01-07T14:23:27+13:00 (14 years ago)

Author:

ak19

Message:

Better way of setting the ENABLE_indexer and USE_SQLITE and ENABLE_JNI variables in the windows makefiles.

File:

• main/trunk/greenstone2/runtime-src/win32.mak (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/win32.mak

@@ -72 +72 @@
 MAKECMD = $(MAKECMD) DLLDEBUG=1
 !ENDIF
-!IF "$(USE_SQLITE)" == ""
-MAKECMD = $(MAKECMD) USE_SQLITE=1
-!ELSE
-MAKECMD = $(MAKECMD) USE_SQLITE=$(USE_SQLITE)
+!IF !$(USE_SQLITE)
+MAKECMD = $(MAKECMD) USE_SQLITE=0
 !ENDIF
 !IF $(USE_MSSQL)
@@ -85 +83 @@
 PACKAGEDIRS = $(PACKAGEDIRS) packages\d2m $(YAZ_DIR)
 !ENDIF
-!IF "$(ENABLE_MG)" == ""
-MAKECMD = $(MAKECMD) ENABLE_MG=1
-!ELSE
-MAKECMD = $(MAKECMD) ENABLE_MG=$(ENABLE_MG)
+!IF !$(ENABLE_MG)
+MAKECMD = $(MAKECMD) ENABLE_MG=0
 !ENDIF
-!IF "$(ENABLE_MGPP)" == ""
-MAKECMD = $(MAKECMD) ENABLE_MGPP=1
-!ELSE
-MAKECMD = $(MAKECMD) ENABLE_MGPP=$(ENABLE_MGPP)
+!IF !$(ENABLE_MGPP)
+MAKECMD = $(MAKECMD) ENABLE_MGPP=0
 !ENDIF
-!IF "$(ENABLE_LUCENE)" == ""
-MAKECMD = $(MAKECMD) ENABLE_LUCENE=1
-!ELSE
-MAKECMD = $(MAKECMD) ENABLE_LUCENE=$(ENABLE_LUCENE)
+!IF !$(ENABLE_LUCENE)
+MAKECMD = $(MAKECMD) ENABLE_LUCENE=0
 !ENDIF