head	1.1;
access;
symbols
	RELEASE_8_3_0:1.1;
locks; strict;
comment	@# @;


1.1
date	2012.03.13.17.02.32;	author mi;	state Exp;
branches;
next	;


desc
@@


1.1
log
@mod_ftp is a FTP Protocol module to serve httpd content over the
FTP protocol (whereever the HTTP protocol could also be used). It
provides both RETR/REST retrieval and STOR/APPE upload, using the
same user/permissions model as httpd (so it shares the same security
considerations as mod_dav plus mod_dav_fs).

WWW: http://httpd.apache.org/mod_ftp/

Feature safe:	yes
@
text
@--- Makefile.apxs	2009-09-28 13:09:53.000000000 -0400
+++ Makefile.apxs	2011-06-21 15:48:39.000000000 -0400
@@@@ -21,5 +21,5 @@@@
 
 TARGETS         = 
-INSTALL_TARGETS = install-conf install-ftpdocs install-manual install-include
+INSTALL_TARGETS = install-conf install-include
 DISTCLEAN_TARGETS  = config.apxs.log modules/ftp/ftp_config.h
 EXTRACLEAN_TARGETS = 
@@@@ -41,6 +41,5 @@@@
 install-conf:
 	@@echo Installing configuration files
-	@@$(MKINSTALLDIRS) $(exp_sysconfdir) $(exp_sysconfdir)/extra \
-		$(exp_sysconfdir)/original $(exp_sysconfdir)/original/extra
+	@@$(MKINSTALLDIRS) $(exp_sysconfdir) $(exp_sysconfdir)/extra
 	@@cd $(ftp_srcdir)/docs/conf; \
 	for j in $(ftp_srcdir)/docs/conf; do \
@@@@ -55,20 +54,9 @@@@
 	    		-e 's#@@rel_logfiledir@@#$(rel_logfiledir)#;' \
 	    		-e 's#@@@@FTPPort@@@@#$(FTPPORT)#;' \
-	    		< $$i > $(exp_sysconfdir)/original/$$i; \
-	    	    chmod 0644 $(exp_sysconfdir)/original/$$i; \
-	    	    if test ! -f $(exp_sysconfdir)/$$i; then \
-	    		cp $(exp_sysconfdir)/original/$$i \
-			    $(exp_sysconfdir)/$$i; \
-	    		chmod 0644 $(exp_sysconfdir)/$$i; \
-	    	    fi; \
+	    		< $$i > $(exp_sysconfdir)/$$i.dist; \
+	    	    chmod 0644 $(exp_sysconfdir)/$$i.dist; \
 	    	fi; \
 	    done ; \
 	done
-	@@awk -f $(ftp_srcdir)/build/addloadexample.awk \
-		-v MODULE=ftp -v DSO=.so -v LIBPATH=$(rel_libexecdir) \
-		-v EXAMPLECONF=$(rel_sysconfdir)/extra/ftpd.conf \
-		$(DESTDIR)$(httpd_conffile) > $(DESTDIR)$(httpd_conffile).new && \
-	  ( mv $(DESTDIR)$(httpd_conffile) $(DESTDIR)$(httpd_conffile).bak && \
-	    mv $(DESTDIR)$(httpd_conffile).new $(DESTDIR)$(httpd_conffile) );
 
 svnroot=http://svn.apache.org/repos/asf/httpd
@
