- pl, cosmetics

[packages/apache.git] / apache-apxs.patch

--- httpd-2.0.46/support/apxs.in.orig	Wed May 21 13:39:52 2003
+++ httpd-2.0.46/support/apxs.in	Thu May 29 07:27:40 2003
@@ -64,11 +64,11 @@
 my %config_vars = ();
 
 my $installbuilddir = "@exp_installbuilddir@";
-get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
+get_config_vars("/usr/lib/apache/build/config_vars.mk",\%config_vars);
 
 # read the configuration variables once
 
-my $prefix         = get_vars("prefix");
+my $prefix         = "/usr/lib/apache";
 my $CFG_PREFIX     = $prefix;
 my $exec_prefix    = get_vars("exec_prefix");
 my $datadir        = get_vars("datadir");
@@ -228,9 +228,7 @@
 my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
 $httpd = eval qq("$httpd");
 $httpd = eval qq("$httpd");
-my $envvars = get_vars("sbindir") . "/envvars";
-$envvars = eval qq("$envvars");
-$envvars = eval qq("$envvars");
+my $envvars = "";
 
 #allow apxs to be run from the source tree, before installation
 if ($0 =~ m:support/apxs$:) {
@@ -376,9 +374,9 @@
     exit(1);
 }
 
-my $libtool = `$apr_bindir/apr-config --installbuilddir`;
-chomp($libtool);
-$libtool = "$libtool/libtool";
+#my $libtool = `$apr_bindir/apr-config --installbuilddir`;
+#chomp($libtool);
+$libtool = "/usr/bin/libtool";
 
 my $apr_includedir = `$apr_bindir/apr-config --includes`;
 chomp($apr_includedir);