Changeset 24880 for main

Timestamp:

2011-12-09T21:28:43+13:00 (12 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:

• cgi-bin/win32.mak (modified) (1 diff)
• win32.mak (modified) (1 diff)

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

@@ -41 +41 @@
 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" 
+
+clean:
+    if exist "$(GSDLHOME)\cgi-bin\windows" rmdir /S "$(GSDLHOME)\cgi-bin\windows"
 
 install:
-    copy * "$(GSDLHOME)\bin\windows\."
-
-clean:
-    rmdir /S "$(GSDLHOME)\cgi-bin\windows"
-    rmdir /S "$(GSDLHOME)\cgi-bin"
-

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

@@ -160 +160 @@
 clean:
     cd "$(COMMONHOME)"
+    cd cgi-bin
+    $(MAKECLEANCMD)
+    cd "$(COMMONHOME)"
     cd packages\windows\crypt\crypt
     $(MAKECLEANCMD)