1 --- httpd-2.0.43/support/apxs.in.wiget Thu Sep 19 07:43:16 2002
2 +++ httpd-2.0.43/support/apxs.in Fri Oct 4 11:35:05 2002
6 my $installbuilddir = "@exp_installbuilddir@";
7 -get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
8 +get_config_vars("/usr/lib/apache/build/config_vars.mk",\%config_vars);
10 # read the configuration variables once
12 -my $prefix = get_vars("prefix");
13 +my $prefix = "/usr/lib/apache";
14 my $CFG_PREFIX = $prefix;
15 my $exec_prefix = get_vars("exec_prefix");
16 my $datadir = get_vars("datadir");
18 my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
19 $httpd = eval qq("$httpd");
20 $httpd = eval qq("$httpd");
21 -my $envvars = get_vars("sbindir") . "/envvars";
22 -$envvars = eval qq("$envvars");
23 -$envvars = eval qq("$envvars");
26 #allow apxs to be run from the source tree, before installation
27 if ($0 =~ m:support/apxs$:) {
32 - push(@cmds, "$installbuilddir/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
33 + push(@cmds, "/usr/bin/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
38 $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version";
41 - push(@cmds, "$installbuilddir/libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
42 + push(@cmds, "/usr/bin/libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
44 # execute the commands
49 push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
50 - "$installbuilddir/libtool' $f $CFG_LIBEXECDIR");
51 + "/usr/bin/libtool' $f $CFG_LIBEXECDIR");
52 push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");