Return-Path: 
 <apache-cvs-return-4277-apmail-apache-cvs-archive=apache.org@apache.org>
Delivered-To: apmail-apache-cvs-archive@apache.org
Received: (qmail 81023 invoked by uid 500); 12 Dec 2000 20:56:38 -0000
Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
list-help: <mailto:apache-cvs-help@apache.org>
list-unsubscribe: <mailto:apache-cvs-unsubscribe@apache.org>
list-post: <mailto:apache-cvs@apache.org>
Delivered-To: mailing list apache-cvs@apache.org
Received: (qmail 80989 invoked by uid 500); 12 Dec 2000 20:56:37 -0000
Delivered-To: apmail-httpd-2.0-cvs@apache.org
Date: 12 Dec 2000 20:56:37 -0000
Message-ID: <20001212205637.80975.qmail@locus.apache.org>
From: wrowe@locus.apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0 Makefile.win

wrowe       00/12/12 12:56:36

  Modified:    .        Makefile.win
  Log:
    Add magic, mime.types and -default of all /conf files to the Win32
    build/install.  Also copy the manual tree to htdocs/manual/, and the
    index pages (if they do not exist) to htdocs/
  
  Revision  Changes    Path
  1.37      +18 -8     httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Makefile.win	2000/12/12 20:34:23	1.36
  +++ Makefile.win	2000/12/12 20:56:35	1.37
  @@ -129,10 +129,12 @@
   
   _install:
   	-mkdir $(INSTDIR)
  -	-mkdir $(INSTDIR)\modules
  -	-mkdir $(INSTDIR)\logs
  -	-mkdir $(INSTDIR)\conf
   	-mkdir $(INSTDIR)\bin
  +	-mkdir $(INSTDIR)\conf
  +	-mkdir $(INSTDIR)\logs
  +	-mkdir $(INSTDIR)\modules
  +	-mkdir $(INSTDIR)\htdocs
  +	-mkdir $(INSTDIR)\htdocs\manual
   	copy Apache$(SHORT)\Apache.exe $(INSTDIR)
   	copy Core$(SHORT)\ApacheCore.dll $(INSTDIR)
   	copy srclib\apr\$(LONG)\aprlib.dll $(INSTDIR)
  @@ -158,27 +160,35 @@
   	copy support\$(LONG)\htdigest.exe $(INSTDIR)\bin
   	copy support\$(LONG)\logresolve.exe $(INSTDIR)\bin
   	copy support\$(LONG)\rotatelogs.exe $(INSTDIR)\bin
  +        if not exist $(INSTDIR)\conf\magic copy docs\conf\magic $(INSTDIR)\conf
  +        copy docs\conf\magic $(INSTDIR)\conf\magic-default
  +	if not exist $(INSTDIR)\conf\mime.types copy docs\conf\mime.types $(INSTDIR)\conf
  +        copy docs\conf\mime.types $(INSTDIR)\conf\mime.types-default
  +        cd docs\docroot
  +          for %%a in (*.*) do if not exist $(INSTDIR)\htdocs\%%a copy %%a $(INSTDIR)\htdocs
  +        cd ..\..
  +        xcopy docs\manual $(INSTDIR)\htdocs\manual /s
   	perl <<
   
       my $$serverroot = '$(INSTDIR)';
       $$serverroot =~ s|\\|\/|;
       open(IN, '< docs\conf\httpd-win.conf') 
           || die 'Source httpd-win.conf not found in docs\conf';
  -    open(OUT, '> $(INSTDIR)\conf\httpd-default.conf') 
  -        || die 'Create file $(INSTDIR)\docs\conf\httpd-default.conf failed';
  +    open(OUT, '> $(INSTDIR)\conf\httpd.conf-default') 
  +        || die 'Create file $(INSTDIR)\conf\httpd.conf-default failed';
       while (<IN>) {
           while (s|\@\@ServerRoot\@\@|$$serverroot|) {}
   	print OUT $_;
       }
  -    print 'Installed httpd-default.conf in $(INSTDIR)\conf' . "\n";
  +    print 'Installed httpd.conf-default in $(INSTDIR)\conf' . "\n";
       close (OUT); 
       seek(IN, 0, SEEK_SET);
       if (open(OUT, '< $(INSTDIR)\conf\httpd.conf')) { 
  -        print 'Existing $(INSTDIR)\docs\conf\httpd.conf preserved' . "\n";
  +        print 'Existing $(INSTDIR)\conf\httpd.conf preserved' . "\n";
           close(OUT); close(IN); exit;
       }
       open(OUT, '> $(INSTDIR)\conf\httpd.conf') 
  -        || die 'Create file $(INSTDIR)\docs\conf\httpd.conf failed';
  +        || die 'Create file $(INSTDIR)\conf\httpd.conf failed';
       while (<IN>) {
           while (s|\@\@ServerRoot\@\@|$$serverroot|) {}
   	print OUT $_;