pcs 99/03/19 09:01:27
Modified: src Makefile_win32.txt Makefile_win32_debug.txt
Makefile.nt
Log:
On "make install", copy htpasswd.exe into $(INSTDIR)/bin (this mirrors
the location of htpasswd on Unix). Add htpasswd to the list of projects
cleaned during "make clean".
Revision Changes Path
1.3 +5 -0 apache-1.3/src/Makefile_win32.txt
Index: Makefile_win32.txt
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile_win32.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile_win32.txt 1999/02/09 18:07:55 1.2
+++ Makefile_win32.txt 1999/03/19 17:01:23 1.3
@@ -65,6 +65,7 @@
-mkdir $(INSTDIR)\modules
-mkdir $(INSTDIR)\logs
-mkdir $(INSTDIR)\conf
+ -mkdir $(INSTDIR)\bin
copy ApacheR\Apache.exe $(INSTDIR)
copy CoreR\ApacheCore.dll $(INSTDIR)
copy os\win32\ApacheModuleStatusR\ApacheModuleStatus.dll
$(INSTDIR)\modules
@@ -78,6 +79,7 @@
copy os\win32\ApacheModuleSpelingR\ApacheModuleSpeling.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleUserTrackR\ApacheModuleUserTrack.dll
$(INSTDIR)\modules
copy modules\proxy\Release\ApacheModuleProxy.dll $(INSTDIR)\modules
+ copy support\Release\htpasswd.exe $(INSTDIR)\bin
clean:
cd os\win32
@@ -88,6 +90,9 @@
cd ..
cd ap
nmake /nologo CFG="ap - Win32 Release" -f ap.mak clean
+ cd ..
+ cd support
+ nmake /nologo CFG="htpasswd - Win32 Release" -f htpasswd.mak clean
cd ..
cd main
nmake /nologo CFG="gen_uri_delims - Win32 Release" -f
gen_uri_delims.mak clean
1.3 +5 -0 apache-1.3/src/Makefile_win32_debug.txt
Index: Makefile_win32_debug.txt
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile_win32_debug.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile_win32_debug.txt 1999/02/09 18:07:56 1.2
+++ Makefile_win32_debug.txt 1999/03/19 17:01:23 1.3
@@ -65,6 +65,7 @@
-mkdir $(INSTDIR)\modules
-mkdir $(INSTDIR)\logs
-mkdir $(INSTDIR)\conf
+ -mkdir $(INSTDIR)\bin
copy ApacheD\Apache.exe $(INSTDIR)
copy CoreD\ApacheCore.dll $(INSTDIR)
copy os\win32\ApacheModuleStatusD\ApacheModuleStatus.dll
$(INSTDIR)\modules
@@ -78,6 +79,7 @@
copy os\win32\ApacheModuleSpelingD\ApacheModuleSpeling.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll
$(INSTDIR)\modules
copy modules\proxy\Debug\ApacheModuleProxy.dll $(INSTDIR)\modules
+ copy support\Debug\htpasswd.exe $(INSTDIR)\bin
clean:
cd os\win32
@@ -88,6 +90,9 @@
cd ..
cd ap
nmake /nologo CFG="ap - Win32 Debug" -f ap.mak clean
+ cd ..
+ cd support
+ nmake /nologo CFG="htpasswd - Win32 Debug" -f htpasswd.mak clean
cd ..
cd main
nmake /nologo CFG="gen_uri_delims - Win32 Debug" -f gen_uri_delims.mak
clean
1.31 +5 -0 apache-1.3/src/Makefile.nt
Index: Makefile.nt
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Makefile.nt,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.nt 1999/01/26 16:46:25 1.30
+++ Makefile.nt 1999/03/19 17:01:23 1.31
@@ -87,6 +87,7 @@
-mkdir $(INSTDIR)\modules
-mkdir $(INSTDIR)\logs
-mkdir $(INSTDIR)\conf
+ -mkdir $(INSTDIR)\bin
copy Apache%SHORT%\Apache.exe $(INSTDIR)
copy Core%SHORT%\ApacheCore.dll $(INSTDIR)
copy os\win32\ApacheModuleStatus%SHORT%\ApacheModuleStatus.dll
$(INSTDIR)\modules
@@ -100,6 +101,7 @@
copy os\win32\ApacheModuleSpeling%SHORT%\ApacheModuleSpeling.dll
$(INSTDIR)\modules
copy os\win32\ApacheModuleUserTrack%SHORT%\ApacheModuleUserTrack.dll
$(INSTDIR)\modules
copy modules\proxy\%LONG%\ApacheModuleProxy.dll $(INSTDIR)\modules
+ copy support\%LONG%\htpasswd.exe $(INSTDIR)\bin
_clean:
cd os\win32
@@ -110,6 +112,9 @@
cd ..
cd ap
nmake /nologo CFG="ap - Win32 %LONG%" -f ap.mak clean
+ cd ..
+ cd support
+ nmake /nologo CFG="htpasswd - Win32 %LONG%" -f htpasswd.mak clean
cd ..
cd main
nmake /nologo CFG="gen_uri_delims - Win32 %LONG%" -f
gen_uri_delims.mak clean
