Show
Ignore:
Timestamp:
15.12.2011 14:40:07 (8 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:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/packages/apache-httpd/windows-httpd.conf.in

    r24874 r24902  
    496496 
    497497 
    498   ScriptAlias /greenstone/cgi-bin "**GSDLHOME**/cgi-bin/**GSDLOS**" 
    499   <Directory "**GSDLHOME**/cgi-bin/**GSDLOS**"> 
     498  ScriptAlias /greenstone/cgi-bin "**GSDLHOME**/cgi-bin/**GSDL_OS_ARCH**" 
     499  <Directory "**GSDLHOME**/cgi-bin/**GSDL_OS_ARCH**"> 
    500500     Options None 
    501501     AllowOverride None 
  • main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak

    r24874 r24902  
    242242!ELSE 
    243243install: $(EXECUTABLE) 
     244!IF "$(PROCESSOR_ARCHITECTURE)"=="" 
    244245    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows" 
     246!ELSE IF EXIST ("$(GSDL_DIR)\bin\windows")   
     247    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows"     
     248!ELSE IF "$(PROCESSOR_ARCHITECTURE)"=="x86"  
     249    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows32" 
     250!ELSE 
     251    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows64" 
     252!ENDIF 
    245253!ENDIF 
    246254 
  • main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

    r24874 r24902  
    384384!ELSE 
    385385install: $(EXECUTABLE) 
     386!IF "$(PROCESSOR_ARCHITECTURE)"==""  
    386387    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows" 
     388!ELSE IF EXIST ("$(GSDL_DIR)\bin\windows") 
     389    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows"     
     390!ELSE IF "$(PROCESSOR_ARCHITECTURE)"=="x86"  
     391    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows32" 
     392!ELSE 
     393    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows64" 
     394!ENDIF 
    387395!ENDIF 
    388396