From: Mladen Turk <mturk@apache.org>
Date: Sun, 23 Jul 2006 08:24:23 +0000 (+0000)
Subject: Fix targets so that InstallBin calls the conf install,
X-Git-Tag: 2.3.0~2237
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c2322c8d7106fb550c8c0c536a39c609cabb94c;p=thirdparty%2Fapache%2Fhttpd.git

Fix targets so that InstallBin calls the conf install,
as well as installr and installd.


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

diff --git a/Makefile.win b/Makefile.win
index c75165df3eb..87f1aee2b75 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -472,6 +472,9 @@ _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.  
 # Then repeatedly invoke the _copybin build to copy the
@@ -479,7 +482,7 @@ _copybin:
 # Then hit docs of various sorts, then includes and libs,
 # and finally do the .conf magic.
 #
-_install:
+_installbase:
 	echo Y >.y
 	echo A >.A
 	-mkdir "$(INSTDIR)"
@@ -650,7 +653,7 @@ BEGIN {
 	copy modules\dav\main\$(LONG)\mod_dav.lib 	"$(INSTDIR)\lib" <.y
 
 
-testconfig:
+_installconf:
 	echo Y >.y
 	for %f in ( charset.conv magic mime.types ) do ( \
 	  copy docs\conf\%f "$(INSTDIR)\conf\%f.default" <.y && \