httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r822472 - /httpd/mod_ftp/trunk/Makefile-ftp.win
Date Tue, 06 Oct 2009 20:20:42 GMT
Author: wrowe
Date: Tue Oct  6 20:20:42 2009
New Revision: 822472

URL: http://svn.apache.org/viewvc?rev=822472&view=rev
Log:
Correct default dir, example nmake syntax and an origconffile bug

Modified:
    httpd/mod_ftp/trunk/Makefile-ftp.win

Modified: httpd/mod_ftp/trunk/Makefile-ftp.win
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/Makefile-ftp.win?rev=822472&r1=822471&r2=822472&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile-ftp.win (original)
+++ httpd/mod_ftp/trunk/Makefile-ftp.win Tue Oct  6 20:20:42 2009
@@ -1,5 +1,6 @@
-# Makefile for Windows NT and Windows 95/98/2000
-
+#
+# NMAKE Makefile for Microsoft Windows 
+#
 # Targets are:
 #   _apacher   - build Apache in Release mode
 #   _apached   - build Apache in Debug mode
@@ -10,7 +11,7 @@
 # The following install defaults may be customized;
 #
 #   Option      Default
-#   INSTDIR     /Apache2x
+#   INSTDIR     /Apache22
 #   FTPPORT     21
 #   DOMAINNAME  example.com
 #   SERVERNAME  www.example.com
@@ -18,7 +19,7 @@
 #
 # For example;
 #
-#   nmake -f Makefile-ftp.win PORT=80 INSTDIR="d:/Program Files/Apache" installr
+#   nmake -f Makefile-ftp.win FTPPORT=8021 INSTDIR="d:/Program Files/Apache" installr
 #
 # Be aware that certain awk's will not accept backslashed names,
 # so the server root should be given in forward slashes (quoted),
@@ -59,7 +60,7 @@
 !ENDIF
 
 !IF "$(INSTDIR)" == ""
-INSTDIR=\Apache2x
+INSTDIR=\Apache22
 !ENDIF
 !IF "$(DOMAINNAME)" == ""
 DOMAINNAME=example.com
@@ -214,7 +215,7 @@
 	copy include\mod_ftp.h "$(INSTDIR)\include" < .y > nul
 	-awk -f build/addloadexample.awk -v MODULE=ftp -v DSO=.so \
 	     -v LIBPATH=modules -v EXAMPLECONF=conf/extra/ftpd.conf \
-	     "$(httpd_conffile)" > "$(httpd_origconffile).new" && \
+	     "$(httpd_origconffile)" > "$(httpd_origconffile).new" && \
 	  ( move "$(httpd_origconffile)" "$(httpd_origconffile).bak" && \
 	    move "$(httpd_origconffile).new" $(httpd_origconffile) )
 	-awk -f build/addloadexample.awk -v MODULE=ftp -v DSO=.so \



Mime
View raw message