Changeset 21332

Timestamp:

2009-12-10T19:52:35+13:00 (13 years ago)

Author:

ak19

Message:

Some Windows-specific bugfixes to the recent changes for enabling or disabling individual indexers during compilation.

Location:

main/trunk/greenstone2

Files:

• common-src/win32.mak (modified) (1 diff)
• runtime-src/packages/apache-httpd/win32.mak (modified) (1 diff)
• runtime-src/src/protocol/win32.mak (modified) (1 diff)

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

@@ -162 +162 @@
     cd "$(COMMONHOME)"
 
-$(SQLITE_DIR): 
+$(SQLITE_DIR): FORCE
 !IF "$(USE_SQLITE)" == "1"
-    FORCE
     cd "$(COMMONHOME)"
     cd "$@"

main/trunk/greenstone2/runtime-src/packages/apache-httpd/win32.mak

@@ -29 +29 @@
 
 compile: 
+    if not exist "$(APACHEHOME)" if exist "$(GSDLHOME)\bin\windows\gunzip.exe" if exist "$(GSDLHOME)\bin\windows\tar.exe" "$(GSDLHOME)\bin\windows\gunzip.exe" -cd "$(APACHEHOME)-gs.tar.gz" | "$(GSDLHOME)\bin\windows\tar.exe" xv --directory=.
+    if not exist "$(APACHEHOME)" echo ****** Couldn't extract archive $(APACHEHOME)-gs.tar.gz. Extract it manually, or check that gunzip.exe and tar.exe exist in $(GSDLHOME)\bin\windows. ******
+    if not exist "$(APACHEHOME)" exit /b 1
     cd "$(APACHEHOME)"
     copy "$(GSDLHOME)\bin\windows\awk.exe" "$(APACHEHOME)\."

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

@@ -60 +60 @@
 !ENDIF
 
-!IF $(ENABLE_MGPP) == "0"
+!IF "$(ENABLE_MGPP)" == "0"
 MGPP_INCLUDES =
 !ELSE