httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r608430 - in /httpd/mod_ftp/trunk: NWGNUmakefile build/mkconfNW.awk
Date Thu, 03 Jan 2008 10:45:10 GMT
Author: fuankg
Date: Thu Jan  3 02:45:09 2008
New Revision: 608430

URL: http://svn.apache.org/viewvc?rev=608430&view=rev
Log:
Shift module extension into the makefile, so that win32 and netware might share the same ftpd.conf
rewriter;
added default basedir to Makefile for 2.0.x line where we dont have it defined yet by build
system;
fixed conf file creation for 2.0.x.


Modified:
    httpd/mod_ftp/trunk/NWGNUmakefile
    httpd/mod_ftp/trunk/build/mkconfNW.awk

Modified: httpd/mod_ftp/trunk/NWGNUmakefile
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/NWGNUmakefile?rev=608430&r1=608429&r2=608430&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/NWGNUmakefile (original)
+++ httpd/mod_ftp/trunk/NWGNUmakefile Thu Jan  3 02:45:09 2008
@@ -23,6 +23,13 @@
 ifndef FTPROOT
 FTPROOT = ftproot
 endif
+ifndef BASEDIR
+BASEDIR = apache2
+endif
+ifndef BASEVOL
+BASEVOL = SYS:
+endif
+SOEXT = nlm
 
 #
 # build this level's files
@@ -35,9 +42,9 @@
 	$(CHKNOT) $(INSTALL)\$(BASEDIR)\$(FTPROOT)\nul mkdir $(INSTALL)\$(BASEDIR)\$(FTPROOT)
 	xcopy $(XCOPYSW) docs\manual $(INSTALL)\$(BASEDIR)\manual
 ifeq "$(wildcard $(INSTALL)\$(BASEDIR)\conf\extra)" "$(INSTALL)\$(BASEDIR)\conf\extra"
-	-$(AWK) -v BDIR=SYS:/$(BASEDIR) -v PORT=$(FTPPORT) -f build\mkconfnw.awk docs\conf\extra\ftpd.conf
>$(INSTALL)\$(BASEDIR)\conf\extra\ftpd.conf
+	-$(AWK) -v BDIR=$(BASEVOL)/$(BASEDIR) -v FTPROOT=$(FTPROOT) -v FTPPORT=$(FTPPORT) -v SOEXT=$(SOEXT)
-f build\mkconfnw.awk docs\conf\extra\ftpd.conf >$(INSTALL)\$(BASEDIR)\conf\extra\ftpd.conf
 else
-	-$(AWK) -v BDIR=SYS:/$(BASEDIR) -v FTPROOT=$(FTPROOT) -v FTPPORT=$(FTPPORT) -f build\mkconfnw.awk
docs\conf\extra\ftpd.conf >$(INSTALL)\$(BASEDIR)\conf\ftpd.conf
+	-$(AWK) -v BDIR=$(BASEVOL)/$(BASEDIR) -v FTPROOT=$(FTPROOT) -v FTPPORT=$(FTPPORT) -v SOEXT=$(SOEXT)
-f build\mkconfnw.awk docs\conf\extra\ftpd.conf >$(INSTALL)\$(BASEDIR)\conf\ftpd.conf
 endif
 
 

Modified: httpd/mod_ftp/trunk/build/mkconfNW.awk
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/build/mkconfNW.awk?rev=608430&r1=608429&r2=608430&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/build/mkconfNW.awk (original)
+++ httpd/mod_ftp/trunk/build/mkconfNW.awk Thu Jan  3 02:45:09 2008
@@ -28,7 +28,7 @@
 }
 
 /#@@LoadFtpModules@@/ {
-    print "LoadModule ftp_module modules/mod_ftp.nlm"
+    print "LoadModule ftp_module modules/mod_ftp."SOEXT
     next
 }
 



Mime
View raw message