Changeset 21348

Timestamp:

2009-12-15T15:25:48+13:00 (14 years ago)

Author:

xiao

Message:

GS2build's win32.mak (and Makefile and configure) aren't used by greenstone3's build.xml file. Only the makefiles of common-src and build-src are called. So the recent changes to enable individual indexers using the ENABLE_ flags are expanded to allow common-src to be able to deal with these flags its own.

File:

• main/trunk/greenstone2/common-src/win32.mak (modified) (1 diff)

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

@@ -54 +54 @@
 
 SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.5.9
+
+# indexers requires the ENABLE_indexer flags to be either 1 or 0,
+# so we ensure this is the case here
+!IF "$(ENABLE_MG)" != "0"
+ENABLE_MG = 1
+!ENDIF
+!IF "$(ENABLE_MGPP)" != "0"
+ENABLE_MGPP = 1
+!ENDIF
+!IF "$(ENABLE_LUCENE)" != "0"
+ENABLE_LUCENE = 1
+!ENDIF
 
 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" BINDIR="$(GSDLHOME)\bin\windows"