Changeset 24902 for main/trunk/greenstone2/runtime-src

Timestamp:

2011-12-15T14:40:07+13:00 (12 years ago)

Author:

ak19

Message:

GSDLARCH used in Windows makefiles (and gsicontrol.bat) when working out the cgi-bin path (now cgi-bin\GSDL_OS_ARCH) to install the binaries like library.cgi and oaiserver.cgi into.

Location:

main/trunk/greenstone2/runtime-src

Files:

• packages/apache-httpd/windows-httpd.conf.in (modified) (1 diff)
• src/oaiservr/win32.mak (modified) (1 diff)
• src/recpt/win32.mak (modified) (1 diff)

main/trunk/greenstone2/runtime-src/packages/apache-httpd/windows-httpd.conf.in

@@ -496 +496 @@
 
 
-  ScriptAlias /greenstone/cgi-bin "**GSDLHOME**/cgi-bin/**GSDLOS**"
-  <Directory "**GSDLHOME**/cgi-bin/**GSDLOS**">
+  ScriptAlias /greenstone/cgi-bin "**GSDLHOME**/cgi-bin/**GSDL_OS_ARCH**"
+  <Directory "**GSDLHOME**/cgi-bin/**GSDL_OS_ARCH**">
      Options None
      AllowOverride None

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

@@ -242 +242 @@
 !ELSE
 install: $(EXECUTABLE)
+!IF "$(PROCESSOR_ARCHITECTURE)"==""
     copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows"
+!ELSE IF EXIST ("$(GSDL_DIR)\bin\windows")  
+    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows"    
+!ELSE IF "$(PROCESSOR_ARCHITECTURE)"=="x86" 
+    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows32"
+!ELSE
+    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows64"
+!ENDIF
 !ENDIF
 

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

@@ -384 +384 @@
 !ELSE
 install: $(EXECUTABLE)
+!IF "$(PROCESSOR_ARCHITECTURE)"=="" 
     copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows"
+!ELSE IF EXIST ("$(GSDL_DIR)\bin\windows")
+    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows"    
+!ELSE IF "$(PROCESSOR_ARCHITECTURE)"=="x86" 
+    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows32"
+!ELSE
+    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows64"
+!ENDIF
 !ENDIF