diff options
Diffstat (limited to 'www/apache21/files/patch-support:apxs.in')
| -rw-r--r-- | www/apache21/files/patch-support:apxs.in | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/www/apache21/files/patch-support:apxs.in b/www/apache21/files/patch-support:apxs.in index 4106153d5e90..6ea17a914bdc 100644 --- a/www/apache21/files/patch-support:apxs.in +++ b/www/apache21/files/patch-support:apxs.in @@ -1,47 +1,40 @@ ---- support/apxs.in.orig Sat Nov 3 05:09:20 2001 -+++ support/apxs.in Sun Dec 9 14:47:57 2001 +--- support/apxs.in.orig Sat Feb 2 04:25:14 2002 ++++ support/apxs.in Fri Feb 22 02:49:11 2002 @@ -66,7 +66,7 @@ # read the configuration variables once my %config_vars = (); -get_config_vars("$prefix/build/config_vars.mk",\%config_vars); -+get_config_vars("$prefix/share/mk/apache/config_vars.mk",\%config_vars); ++get_config_vars("$prefix/share/apache/config_vars.mk",\%config_vars); my $exec_prefix = get_vars("exec_prefix"); my $CFG_TARGET = get_vars("progname"); -@@ -218,7 +218,7 @@ - ## - ## Initial shared object support check - ## --my $httpd = get_vars("bindir") . "/" . get_vars("progname"); -+my $httpd = get_vars("sbindir") . "/" . get_vars("progname"); - $httpd = eval qq("$httpd"); - $httpd = eval qq("$httpd"); - -@@ -412,7 +412,7 @@ +@@ -414,7 +414,7 @@ $la =~ s|\.c$|.la|; my $o = $s; $o =~ s|\.c$|.o|; -- push(@cmds, "$prefix/build/libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); -+ push(@cmds, "$prefix/share/mk/apache/libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); +- push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); ++ push(@cmds, "$prefix/share/apache/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); unshift(@objs, $lo); } -@@ -437,7 +437,7 @@ +@@ -439,7 +439,7 @@ $opt .= " -l$opt_l"; } -- push(@cmds, "$prefix/build/libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo"); -+ push(@cmds, "$prefix/share/mk/apache/libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo"); +- push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo"); ++ push(@cmds, "$prefix/share/apache/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo"); # execute the commands &execute_cmds(@cmds); -@@ -467,7 +467,7 @@ - my $t = $f; +@@ -470,8 +470,8 @@ $t =~ s|^.+/([^/]+)$|$1|; + $t =~ s|\.la$|\.so|; if ($opt_i) { -- push(@cmds, "$prefix/build/libtool --mode=install cp $f $CFG_LIBEXECDIR/$t"); -+ push(@cmds, "$prefix/share/mk/apache/libtool --mode=install cp $f $CFG_LIBEXECDIR/$t"); +- push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" . +- "$prefix/build/libtool' $f $CFG_LIBEXECDIR"); ++ push(@cmds, "$prefix/share/apache/instdso.sh SH_LIBTOOL='" . ++ "$prefix/share/apache/libtool' $f $CFG_LIBEXECDIR"); push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); } |