]>
Commit | Line | Data |
---|---|---|
9d781f9b MM |
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 | |
3 | @@ -64,11 +64,11 @@ | |
4 | my %config_vars = (); | |
5 | ||
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); | |
9 | ||
10 | # read the configuration variables once | |
11 | ||
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"); | |
17 | @@ -228,9 +228,7 @@ | |
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"); | |
24 | +my $envvars = ""; | |
25 | ||
26 | #allow apxs to be run from the source tree, before installation | |
27 | if ($0 =~ m:support/apxs$:) { | |
28 | @@ -424,7 +422,7 @@ | |
29 | $la =~ s|\.c$|.la|; | |
30 | my $o = $s; | |
31 | $o =~ s|\.c$|.o|; | |
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"); | |
34 | unshift(@objs, $lo); | |
35 | } | |
36 | ||
37 | @@ -473,7 +471,7 @@ | |
38 | $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version"; | |
39 | } | |
40 | ||
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"); | |
43 | ||
44 | # execute the commands | |
45 | &execute_cmds(@cmds); | |
46 | @@ -505,7 +503,7 @@ | |
47 | $t =~ s|\.la$|\.so|; | |
48 | if ($opt_i) { | |
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"); | |
53 | } | |
54 |