httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r605071 - in /httpd/mod_ftp/trunk: Makefile.apxs build/addloadexample.awk
Date Tue, 18 Dec 2007 03:14:12 GMT
Author: wrowe
Date: Mon Dec 17 19:14:10 2007
New Revision: 605071

URL: http://svn.apache.org/viewvc?rev=605071&view=rev
Log:
Add a DSO variable (default to .so for unix) so that
it's trivial to use this script for netware.

Modified:
    httpd/mod_ftp/trunk/Makefile.apxs
    httpd/mod_ftp/trunk/build/addloadexample.awk

Modified: httpd/mod_ftp/trunk/Makefile.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/Makefile.apxs?rev=605071&r1=605070&r2=605071&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile.apxs (original)
+++ httpd/mod_ftp/trunk/Makefile.apxs Mon Dec 17 19:14:10 2007
@@ -56,7 +56,7 @@
 	    done ; \
 	done
 	@awk -f $(ftp_srcdir)/build/addloadexample.awk \
-		-v MODULE=ftp -v LIBPATH=$(rel_libexecdir) \
+		-v MODULE=ftp -v DSO=so -v LIBPATH=$(rel_libexecdir) \
 		-v EXAMPLECONF=$(rel_sysconfdir)/extra/ftpd.conf \
 		$(httpd_conffile) > $(httpd_conffile).new && \
 	  ( mv $(httpd_conffile) $(httpd_conffile).bak && \

Modified: httpd/mod_ftp/trunk/build/addloadexample.awk
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/build/addloadexample.awk?rev=605071&r1=605070&r2=605071&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/build/addloadexample.awk (original)
+++ httpd/mod_ftp/trunk/build/addloadexample.awk Mon Dec 17 19:14:10 2007
@@ -6,13 +6,13 @@
 
 tolower($0) ~ /^[# \t]*loadmodule[ \t]/ {
   if ( $2 == MODULE "_module" ) {
-    print "LoadModule " MODULE "_module " LIBPATH "/mod_" MODULE ".so";
+    print "LoadModule " MODULE "_module " LIBPATH "/mod_" MODULE DSO;
     lms = 2;
     next;
   }
   # test $3 since # LoadModule is split into two tokens
   else if ( $3 == MODULE "_module" ) {
-    print $1 "LoadModule " MODULE "_module " LIBPATH "/mod_" MODULE ".so";
+    print $1 "LoadModule " MODULE "_module " LIBPATH "/mod_" MODULE DSO;
     lms = 2;
     next;
   }
@@ -20,7 +20,7 @@
 }
 
 $0 ~ /^[ \t]*$/ && lms == 1 {
-  print "LoadModule " MODULE "_module " LIBPATH "/mod_" MODULE ".so";
+  print "LoadModule " MODULE "_module " LIBPATH "/mod_" MODULE DSO;
   lms = 2;
 } 
 
@@ -34,7 +34,7 @@
   if ( lms < 3 ) { 
     if ( ! /^[ \t]*$/ ) print "";
     if ( lms < 2 ) { 
-      print "LoadModule " MODULE "_module " LIBPATH "/mod_" MODULE ".so";
+      print "LoadModule " MODULE "_module " LIBPATH "/mod_" MODULE DSO;
       print "";
     }
     print "# Example mod_" MODULE " configuration";



Mime
View raw message