From: William A. Rowe Jr <wrowe@apache.org>
Date: Sun, 23 Jul 2006 08:59:14 +0000 (+0000)
Subject:   Simplify; installtest was an -artifact-, not a design decision :-)
X-Git-Tag: 2.3.0~2235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=617840c8c22d64f81cba16b772f314d4f460dff6;p=thirdparty%2Fapache%2Fhttpd.git

  Simplify; installtest was an -artifact-, not a design decision :-)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@424691 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.win b/Makefile.win
index 679a6a36b85..4e71b3f787d 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -472,8 +472,6 @@ _copybin:
 	copy support\win32\$(LONG)\ApacheMonitor.$(src_exe) 	"$(inst_exe)" <.y
 	copy support\win32\$(LONG)\wintty.$(src_exe) 		"$(inst_exe)" <.y
 
-_install: _installbase _installconf
-
 
 # First we create the tree and populate the README so that 
 # whatever happens, all licensing has already propagated.  
@@ -482,7 +480,7 @@ _install: _installbase _installconf
 # Then hit docs of various sorts, then includes and libs,
 # and finally do the .conf magic.
 #
-_installbase:
+_install:
 	echo Y >.y
 	echo A >.A
 	-mkdir "$(INSTDIR)"
@@ -651,9 +649,6 @@ BEGIN {
 	copy $(LONG)\libhttpd.lib 			"$(INSTDIR)\lib" <.y
 	copy modules\dav\main\$(LONG)\mod_dav.exp 	"$(INSTDIR)\lib" <.y
 	copy modules\dav\main\$(LONG)\mod_dav.lib 	"$(INSTDIR)\lib" <.y
-
-
-_installconf:
 	echo Y >.y
 	for %f in ( charset.conv magic mime.types ) do ( \
 	  copy docs\conf\%f "$(INSTDIR)\conf\%f.default" <.y && \