SOURCES: apache-apxs.patch - make apxs -i respect $DESTDIR (for us...

[glen]

Author: glen                         Date: Wed Dec 28 14:11:40 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- make apxs -i respect $DESTDIR (for use with $RPM_BUILD_ROOT from %install targets)

---- Files affected:
SOURCES:
   apache-apxs.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/apache-apxs.patch
diff -u SOURCES/apache-apxs.patch:1.5 SOURCES/apache-apxs.patch:1.6
--- SOURCES/apache-apxs.patch:1.5	Mon Jul 26 00:37:33 2004
+++ SOURCES/apache-apxs.patch	Wed Dec 28 15:11:35 2005
@@ -24,3 +24,24 @@
  sub get_config_vars{
      my ($file, $rh_config) = @_;
  
+--- httpd-2.2.0/support/apxs.in	2005-12-27 00:22:41.000000000 +0200
++++ /usr/sbin/apxs	2005-12-28 16:06:45.000000000 +0200
+@@ -44,6 +44,7 @@
+ my $CFG_CC         = get_vars("CC");
+ my $libexecdir     = get_vars("libexecdir");
+ my $CFG_LIBEXECDIR = eval qq("$libexecdir");
++my $DESTDIR        = $ENV{'DESTDIR'};
+ my $sbindir        = get_vars("sbindir");
+ my $CFG_SBINDIR    = eval qq("$sbindir");
+ my $ltflags        = $ENV{'LTFLAGS'};
+@@ -478,8 +479,8 @@
+         $t =~ s|\.[^./\\]+$|\.so|;
+         if ($opt_i) {
+ 	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
+-                 "$libtool' $f $CFG_LIBEXECDIR");
+-	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
++                 "$libtool' $f $DESTDIR$CFG_LIBEXECDIR");
++	    push(@cmds, "chmod 755 $DESTDIR$CFG_LIBEXECDIR/$t");
+         }
+ 
+         #   determine module symbolname and filename
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache-apxs.patch?r1=1.5&r2=1.6&f=u