]>
Commit | Line | Data |
---|---|---|
8eed07a7 AM |
1 | diff -urN httpd-2.0.36.org/support/apxs.in httpd-2.0.36/support/apxs.in |
2 | --- httpd-2.0.36.org/support/apxs.in Sat May 11 21:28:40 2002 | |
3 | +++ httpd-2.0.36/support/apxs.in Sat May 11 21:29:41 2002 | |
9330bb0e AM |
4 | @@ -61,12 +61,12 @@ |
5 | ## Configuration | |
6 | ## | |
7 | ||
8 | -my $prefix = "@prefix@"; | |
9 | +my $prefix = "/usr/lib/apache"; | |
10 | my $CFG_PREFIX = $prefix; | |
b96476be | 11 | |
1ac3ec23 AM |
12 | # read the configuration variables once |
13 | my %config_vars = (); | |
14 | -get_config_vars("$prefix/build/config_vars.mk",\%config_vars); | |
b39b9678 | 15 | +get_config_vars("/usr/lib/apache/build/config_vars.mk",\%config_vars); |
1ac3ec23 AM |
16 | |
17 | my $exec_prefix = get_vars("exec_prefix"); | |
18 | my $CFG_TARGET = get_vars("progname"); | |
8eed07a7 AM |
19 | @@ -223,9 +223,10 @@ |
20 | my $httpd = get_vars("sbindir") . "/" . get_vars("progname"); | |
21 | $httpd = eval qq("$httpd"); | |
22 | $httpd = eval qq("$httpd"); | |
23 | -my $envvars = get_vars("bindir") . "/envvars"; | |
24 | -$envvars = eval qq("$envvars"); | |
25 | -$envvars = eval qq("$envvars"); | |
26 | +my $envvars = ""; | |
27 | +#my $envvars = get_vars("bindir") . "/envvars"; | |
28 | +#$envvars = eval qq("$envvars"); | |
29 | +#$envvars = eval qq("$envvars"); | |
30 | ||
31 | #allow apxs to be run from the source tree, before installation | |
32 | if ($0 =~ m:support/apxs$:) { | |
33 | @@ -418,7 +419,7 @@ | |
9330bb0e AM |
34 | $la =~ s|\.c$|.la|; |
35 | my $o = $s; | |
36 | $o =~ s|\.c$|.o|; | |
37 | - push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); | |
38 | + push(@cmds, "/usr/bin/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo"); | |
39 | unshift(@objs, $lo); | |
40 | } | |
41 | ||
8eed07a7 | 42 | @@ -443,7 +444,7 @@ |
9330bb0e AM |
43 | $opt .= " -l$opt_l"; |
44 | } | |
45 | ||
46 | - push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo"); | |
47 | + push(@cmds, "/usr/bin/libtool $ltflags --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo"); | |
48 | ||
49 | # execute the commands | |
50 | &execute_cmds(@cmds); | |
8eed07a7 | 51 | @@ -475,7 +476,7 @@ |
9330bb0e AM |
52 | $t =~ s|\.la$|\.so|; |
53 | if ($opt_i) { | |
54 | push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" . | |
55 | - "$prefix/build/libtool' $f $CFG_LIBEXECDIR"); | |
56 | + "/usr/bin/libtool' $f $CFG_LIBEXECDIR"); | |
57 | push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t"); | |
58 | } | |
59 |