www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

Build was broken on some pure unixish awks, this fixes.

Browse Source 
Obtained from:	new-httpd
Submitted by:	Roman Neuhauser


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87664 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2001-01-12 03:38:28 +00:00
parent c33b25a3dd
commit 2414fc8ec0
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
InstallBin.dsp
View File

@@ -39,7 +39,7 @@ CFG=InstallBin - Win32 Debug
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2.0" SHORT=R LONG=Release _install"
# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="/Apache2.0" SHORT=R LONG=Release _install"
# PROP Rebuild_Opt ""
# PROP Target_File "\Apache2.0\Apache.exe"
# PROP Bsc_Name ""
@@ -58,9 +58,9 @@ CFG=InstallBin - Win32 Debug
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2.0" SHORT=D LONG=Debug _install"
# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="/Apache2.0" SHORT=D LONG=Debug _install"
# PROP Rebuild_Opt ""
# PROP Target_File "\Apache2.0\Apache.exe"
# PROP Target_File "/Apache-2.0/Apache.exe"
# PROP Bsc_Name ""
# PROP Target_Dir ""

15
Makefile.win
View File

@@ -9,16 +9,19 @@
# _cleanr - remove (most) files generated by a Release build
# _cleand - remove (most) files generated by a Debug build
#
# The default installation directory is \Apache. This can be changed
# The default installation directory is /Apache2.0. This can be changed
# with the INSTDIR macro, for example:
#
# nmake /f Makefile.win INSTDIR="d:\Program Files\Apache" installr
# nmake /f Makefile.win INSTDIR="d:/Program Files/Apache" installr
#
# Note: this does *NOT* change the compiled in default "server root"
# Also be aware that certain awk's will not accept backslahed names,
# so the server root should be given in forward slashes (quoted),
# preferably with the drive designation!
!IF "$(INSTDIR)" == ""
INSTDIR=\Apache
!MESSAGE Using default install directory \Apache
INSTDIR=/Apache2.0
!MESSAGE Using default install directory /Apache2.0
!ENDIF
!IFNDEF MAKEOPT
@@ -210,7 +213,7 @@ A
copy docs\conf\mime.types "$(INSTDIR)\conf\mime.types.default"
if not exist "$(INSTDIR)\conf\mime.types" \
copy "$(INSTDIR)\conf\mime.types.default" "$(INSTDIR)\conf\mime.types"
awk -f << docs\conf\httpd-win.conf "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)"
awk -f <<script.awk docs/conf/httpd-win.conf "$(INSTDIR)/conf/httpd.default.conf" "$(INSTDIR)"
BEGIN {
srcfl = ARGV[1];
dstfl = ARGV[2];
@@ -224,7 +227,7 @@ A
<<
if not exist "$(INSTDIR)\conf\httpd.conf" \
copy "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)\conf\httpd.conf"
awk -f << support\dbmmanage >"$(INSTDIR)\bin\dbmmanage.pl"
awk -f <<script.awk support/dbmmanage >"$(INSTDIR)/bin/dbmmanage.pl"
{ if ( $$0 !~ /^#.*-lsdbm/) {
gsub( /AnyDBM_File::ISA = qw\(.*\)/, "AnyDBM_File::ISA = qw(SDBM_File)" );
print $$0;