X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapache.git;a=blobdiff_plain;f=apache-apxs.patch;h=309ee24e982302d6f9a383b4450ed40122b288bf;hp=7ee05ad5f39e894e694ab40a89bf2e82870cce7d;hb=f13f85964fc303b8f372ee81cd9e141a25f0b8ad;hpb=03fa0e1eac0d3851c5ae1ab08a02cc3a5ee4eb69

diff --git a/apache-apxs.patch b/apache-apxs.patch
index 7ee05ad..309ee24 100644
--- a/apache-apxs.patch
+++ b/apache-apxs.patch
@@ -25,34 +25,10 @@
  		print STDERR "apxs:Error: no config variable $var\n";
  		&usage;
  	    }
-@@ -199,11 +201,10 @@
-     ($httpd = $0) =~ s:support/apxs$::;
- }
- 
--unless (-x "$httpd") {
--	error("$httpd not found or not executable");
--	exit 1;
-+if (not -x "$httpd") {
-+	print STDERR "Note: $httpd not found or not executable.\n";
- }
--
-+else {
- unless (grep /mod_so/, `. $envvars && $httpd -l`) {
-     error("Sorry, no shared object support for Apache");
-     error("available under your platform. Make sure");
-@@ -211,7 +212,7 @@
-     error("your server binary `$httpd'.");
-     exit 1;
- }
--
-+}
- sub get_config_vars{
-     my ($file, $rh_config) = @_;
- 
 @@ -479,8 +480,8 @@
          $t =~ s|\.[^./\\]+$|\.so|;
          if ($opt_i) {
- 	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
+ 	    push(@cmds, $destdir . "$installbuilddir/instdso.sh SH_LIBTOOL='" .
 -                 "$libtool' $f $CFG_LIBEXECDIR");
 -	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
 +                 "$libtool' $f $CFG_DESTDIR$CFG_LIBEXECDIR");