httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r664603 - in /httpd/mod_ftp/trunk: NWGNUftp-makefile NWGNUmakefile README-FTP build/mkconfNW-ftp.awk build/mkconfNW.awk
Date Mon, 09 Jun 2008 02:10:32 GMT
Author: wrowe
Date: Sun Jun  8 19:10:31 2008
New Revision: 664603

URL: http://svn.apache.org/viewvc?rev=664603&view=rev
Log:
The filenames chosen for the mod_ftp repository are deliberately laid out
to permit the user to export or unpack mod_ftp on top of an existing httpd
tree without file conflicts.  Although Win32 and Netware still need a bit
of patch or magic to inject the mod_ftp build into the httpd build.

Rename conflicting files.

Added:
    httpd/mod_ftp/trunk/NWGNUftp-makefile
      - copied, changed from r664374, httpd/mod_ftp/trunk/NWGNUmakefile
    httpd/mod_ftp/trunk/build/mkconfNW-ftp.awk
      - copied unchanged from r664374, httpd/mod_ftp/trunk/build/mkconfNW.awk
Removed:
    httpd/mod_ftp/trunk/NWGNUmakefile
    httpd/mod_ftp/trunk/build/mkconfNW.awk
Modified:
    httpd/mod_ftp/trunk/README-FTP

Copied: httpd/mod_ftp/trunk/NWGNUftp-makefile (from r664374, httpd/mod_ftp/trunk/NWGNUmakefile)
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/NWGNUftp-makefile?p2=httpd/mod_ftp/trunk/NWGNUftp-makefile&p1=httpd/mod_ftp/trunk/NWGNUmakefile&r1=664374&r2=664603&rev=664603&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/NWGNUmakefile (original)
+++ httpd/mod_ftp/trunk/NWGNUftp-makefile Sun Jun  8 19:10:31 2008
@@ -42,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=$(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
+	-$(AWK) -v BDIR=$(BASEVOL)/$(BASEDIR) -v FTPROOT=$(FTPROOT) -v FTPPORT=$(FTPPORT) -v SOEXT=$(SOEXT)
-f build\mkconfNW-ftp.awk docs\conf\extra\ftpd.conf >$(INSTALL)\$(BASEDIR)\conf\extra\ftpd.conf
 else
-	-$(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
+	-$(AWK) -v BDIR=$(BASEVOL)/$(BASEDIR) -v FTPROOT=$(FTPROOT) -v FTPPORT=$(FTPPORT) -v SOEXT=$(SOEXT)
-f build\mkconfNW-ftp.awk docs\conf\extra\ftpd.conf >$(INSTALL)\$(BASEDIR)\conf\ftpd.conf
 endif
 
 

Modified: httpd/mod_ftp/trunk/README-FTP
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/README-FTP?rev=664603&r1=664602&r2=664603&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/README-FTP (original)
+++ httpd/mod_ftp/trunk/README-FTP Sun Jun  8 19:10:31 2008
@@ -87,10 +87,10 @@
 or:
 http://httpd.apache.org/docs/2.0/platform/netware.html#comp
 Then chance to the base directory and use:
-gmake -f NWGNUmakefile
+gmake -f NWGNUftp-makefile
 to compile the module; to install the module and documentation into
 the default distribution directory use: 
-gmake -f NWGNUmakefile install
+gmake -f NWGNUftp-makefile install
 
 
 



Mime
View raw message