Changeset 24880

Show
Ignore:
Timestamp:
09.12.2011 21:28:43 (8 years ago)
Author:
ak19
Message:

Corrections and additions after testing on Windows the recent commits to do with the cgi-bin directory having moved from the top level folder of GS2 into common-src.

Location:
main/trunk/greenstone2/common-src
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/cgi-bin/win32.mak

    r24878 r24880  
    4141all: 
    4242    if not exist "$(GSDLHOME)\cgi-bin\windows" mkdir "$(GSDLHOME)\cgi-bin\windows"  
     43    for %%i in ("$(COMMON_DIR)\cgi-bin") do copy %%i "$(GSDLHOME)\cgi-bin\windows\." 
     44    for %%i in (Makefile.in Makefile win32.mak) do if exist "$(GSDLHOME)\cgi-bin\windows\%%i" del "$(GSDLHOME)\cgi-bin\windows\%%i"  
     45 
     46clean: 
     47    if exist "$(GSDLHOME)\cgi-bin\windows" rmdir /S "$(GSDLHOME)\cgi-bin\windows" 
    4348 
    4449install: 
    45     copy * "$(GSDLHOME)\bin\windows\." 
    46  
    47 clean: 
    48     rmdir /S "$(GSDLHOME)\cgi-bin\windows" 
    49     rmdir /S "$(GSDLHOME)\cgi-bin" 
    50  
  • main/trunk/greenstone2/common-src/win32.mak

    r24874 r24880  
    160160clean: 
    161161    cd "$(COMMONHOME)" 
     162    cd cgi-bin 
     163    $(MAKECLEANCMD) 
     164    cd "$(COMMONHOME)" 
    162165    cd packages\windows\crypt\crypt 
    163166    $(MAKECLEANCMD)