httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r608343 - in /httpd/mod_ftp/trunk: NWGNUmakefile build/mkconfNW.awk
Date Thu, 03 Jan 2008 05:44:29 GMT
Author: wrowe
Date: Wed Jan  2 21:44:07 2008
New Revision: 608343

URL: http://svn.apache.org/viewvc?rev=608343&view=rev
Log:
Shift SYS:/ into the makefile, so that win32 and netware
might share the same ftpd.conf rewriter, if that's ok
with everyone.

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=608343&r1=608342&r2=608343&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/NWGNUmakefile (original)
+++ httpd/mod_ftp/trunk/NWGNUmakefile Wed Jan  2 21:44:07 2008
@@ -35,9 +35,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=$(BASEDIR) -v PORT=$(FTPPORT) -f build\mkconfnw.awk docs\conf\extra\ftpd.conf
>$(INSTALL)\$(BASEDIR)\conf\extra\ftpd.conf
+	-$(AWK) -v BDIR=SYS:/$(BASEDIR) -v PORT=$(FTPPORT) -f build\mkconfnw.awk docs\conf\extra\ftpd.conf
>$(INSTALL)\$(BASEDIR)\conf\extra\ftpd.conf
 else
-	-$(AWK) -v BDIR=$(BASEDIR) -v FTPROOT=$(FTPROOT) -v FTPPORT=$(FTPPORT) -f build\mkconfnw.awk
docs\conf\extra\ftpd.conf >$(INSTALL)\$(BASEDIR)\conf\ftpd.conf
+	-$(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
 endif
 
 

Modified: httpd/mod_ftp/trunk/build/mkconfNW.awk
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/build/mkconfNW.awk?rev=608343&r1=608342&r2=608343&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/build/mkconfNW.awk (original)
+++ httpd/mod_ftp/trunk/build/mkconfNW.awk Wed Jan  2 21:44:07 2008
@@ -15,7 +15,7 @@
 
 BEGIN {
     
-    A["ServerRoot"] = "SYS:/"BDIR
+    A["ServerRoot"] = BDIR
     A["FTPPort"] = FTPPORT
     A["ftpdocsdir"] = FTPROOT
     A["logfiledir"] = "logs"



Mime
View raw message