Changeset 24902 for main/trunk/greenstone2/common-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.

File:

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

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

@@ -38 +38 @@
 DLLDEBUG = 0
 
+CGIDIR="$(GSDLHOME)\cgi-bin\windows"
+!IF "$(PROCESSOR_ARCHITECTURE)"=="" 
+CGIDIR=$(GSDLHOME)\cgi-bin\windows
+!ELSE IF EXIST ("$(GSDLHOME)\bin\windows")
+CGIDIR=$(GSDLHOME)\cgi-bin\windows
+!ELSE IF "$(PROCESSOR_ARCHITECTURE)"=="x86" 
+CGIDIR=$(GSDLHOME)\cgi-bin\windows32
+!ELSE
+CGIDIR=$(GSDLHOME)\cgi-bin\windows64
+!ENDIF
 
-all:
-    if not exist "$(GSDLHOME)\cgi-bin\windows" mkdir "$(GSDLHOME)\cgi-bin\windows" 
-    for %%i in ("$(COMMON_DIR)\cgi-bin") do copy %%i "$(GSDLHOME)\cgi-bin\windows\."
-    for %%i in (Makefile.in Makefile win32.mak) do if exist "$(GSDLHOME)\cgi-bin\windows\%%i" del "$(GSDLHOME)\cgi-bin\windows\%%i" 
+all:    
+    if not exist "$(CGIDIR)" mkdir "$(CGIDIR)" 
+    for %%i in ("$(COMMON_DIR)\cgi-bin") do copy %%i "$(CGIDIR)\."
+    for %%i in (Makefile.in Makefile win32.mak) do if exist "$(CGIDIR)\%%i" del "$(CGIDIR)\%%i" 
 
 clean:
-    if exist "$(GSDLHOME)\cgi-bin\windows" rmdir /S "$(GSDLHOME)\cgi-bin\windows"
+    if exist "$(CGIDIR)" rmdir /S "$(CGIDIR)"
 
 install: