]> granicus.if.org Git - apache/commitdiff
whoops - moving to fast - fix 1.135 to exclude the appropriate
authorWilliam A. Rowe Jr <wrowe@apache.org>
Mon, 15 Mar 2004 20:01:07 +0000 (20:01 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Mon, 15 Mar 2004 20:01:07 +0000 (20:01 +0000)
  makefile section if ssl.conf is unneeded.

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

Makefile.win

index b52ff441cf5762ff3073cbc28873e4ea29ad32c5..aed5c2d1f6bee7d6f643a98ba281fbd80609a0ef 100644 (file)
@@ -644,6 +644,7 @@ BEGIN {
 <<
        if not exist "$(INSTDIR)\conf\httpd.conf" \
            copy "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)\conf\httpd.conf"
+!IF EXIST("srclib\openssl")
        copy docs\conf\ssl-std.conf.in "$(INSTDIR)\conf\ssl.default.conf" <.y
        -awk -f <<script.awk "docs/conf/ssl-std.conf" "$(INSTDIR)" > "$(INSTDIR)\conf\ssl.default.conf"
     BEGIN { 
@@ -658,9 +659,9 @@ BEGIN {
        print $$0;
     }
 <<
-!IF EXIST("srclib\openssl")
        if not exist "$(INSTDIR)\conf\ssl.conf" \
            copy "$(INSTDIR)\conf\ssl.default.conf" "$(INSTDIR)\conf\ssl.conf"
+!ENDIF
        -awk -f <<script.awk "support/dbmmanage.in" >"$(INSTDIR)\bin\dbmmanage.pl"
     { if ( $$0 ~ /^BEGIN \{ @AnyDBM_File::/ ) {
          sub( /ISA = qw\(.*\)/, "ISA = qw(SDBM_File)" ); 
@@ -669,6 +670,5 @@ BEGIN {
          print $$0;
     }
 <<
-!ENDIF
        del .y
        del .a