]> git.pld-linux.org Git - packages/apache.git/blame - apache-apxs.patch
update doc links to 2.4 version
[packages/apache.git] / apache-apxs.patch
CommitLineData
8c21f0af 1--- httpd-2.2.3/support/apxs.in-orig 2006-11-01 00:59:27.000000000 +0100
2+++ httpd-2.2.3/support/apxs.in 2006-11-01 00:59:54.000000000 +0100
3@@ -35,6 +35,7 @@
4 my $exec_prefix = get_vars("exec_prefix");
5 my $datadir = get_vars("datadir");
6 my $localstatedir = get_vars("localstatedir");
7+my $libdir = get_vars("libdir");
8 my $CFG_TARGET = get_vars("progname");
9 my $CFG_SYSCONFDIR = get_vars("sysconfdir");
10 my $CFG_CFLAGS = join ' ', map { get_vars($_) }
11@@ -44,6 +45,7 @@
1f094160
ER
12 my $CFG_CC = get_vars("CC");
13 my $libexecdir = get_vars("libexecdir");
14 my $CFG_LIBEXECDIR = eval qq("$libexecdir");
15+my $CFG_DESTDIR = '';
16 my $sbindir = get_vars("sbindir");
17 my $CFG_SBINDIR = eval qq("$sbindir");
18 my $ltflags = $ENV{'LTFLAGS'};
8c21f0af 19@@ -171,7 +173,7 @@
1f094160
ER
20 my ($val) = $2;
21 my $oldval = eval "\$CFG_$var";
22
23- unless ($var and $oldval) {
24+ unless ($var and defined $oldval) {
25 print STDERR "apxs:Error: no config variable $var\n";
26 &usage;
27 }
8c21f0af 28@@ -479,8 +480,8 @@
85f276f0
ER
29 $t =~ s|\.[^./\\]+$|\.so|;
30 if ($opt_i) {
31 push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
32- "$libtool' $f $CFG_LIBEXECDIR");
33- push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
1f094160
ER
34+ "$libtool' $f $CFG_DESTDIR$CFG_LIBEXECDIR");
35+ push(@cmds, "chmod 755 $CFG_DESTDIR$CFG_LIBEXECDIR/$t");
85f276f0
ER
36 }
37
38 # determine module symbolname and filename
This page took 0.031001 seconds and 4 git commands to generate.