Stupid patch for a change :)

[Pier Fumagalli]

Not that usually I send something worthwhile, but I don't like the default
Apache 2.0 layout... :)

This fixes a couple of silly scripts...

    Pier

cvs server: Diffing .
Index: apachectl.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/support/apachectl.in,v
retrieving revision 1.9
diff -u -3 -r1.9 apachectl.in
--- apachectl.in        15 Dec 2001 13:56:36 -0000      1.9
+++ apachectl.in        1 Mar 2002 21:22:37 -0000
@@ -26,14 +26,14 @@
 # --------------------                              --------------------
 # 
 # the path to your PID file
-PIDFILE=@prefix@/logs/@progname@.pid
+PIDFILE=@runtimedir@/@progname@.pid
 #
 # the path to your httpd binary, including options if necessary
-HTTPD='@prefix@/bin/@progname@'
+HTTPD='@sbindir@/@progname@'
 #
 # pick up any necessary environment variables
-if test -f @prefix@/bin/envvars; then
-  . @prefix@/bin/envvars
+if test -f @bindir@/envvars; then
+  . @bindir@/bin/envvars
 fi
 #
 # a command that outputs a formatted text version of the HTML at the
Index: apxs.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/support/apxs.in,v
retrieving revision 1.34
diff -u -3 -r1.34 apxs.in
--- apxs.in     1 Feb 2002 19:25:14 -0000       1.34
+++ apxs.in     1 Mar 2002 21:22:38 -0000
@@ -61,12 +61,12 @@
 ##  Configuration
 ##
 
-my $prefix         = "@prefix@";
-my $CFG_PREFIX     = $prefix;
+my $prefix         = "@installbuilddir@";
+my $CFG_PREFIX     = "@prefix@";
 
 # read the configuration variables once
 my %config_vars = ();
-get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
+get_config_vars("$prefix/config_vars.mk",\%config_vars);
 
 my $exec_prefix    = get_vars("exec_prefix");
 my $CFG_TARGET     = get_vars("progname");
@@ -414,7 +414,7 @@
         $la =~ s|\.c$|.la|;
         my $o = $s;
         $o =~ s|\.c$|.o|;
-        push(@cmds, "$prefix/build/libtool $ltflags --mode=compile $CFG_CC
$cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
+        push(@cmds, "$prefix/libtool $ltflags --mode=compile $CFG_CC
$cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
         unshift(@objs, $lo);
     }
 
@@ -439,7 +439,7 @@
         $opt .= " -l$opt_l";
     }
 
-    push(@cmds, "$prefix/build/libtool $ltflags --mode=link $CFG_CC -o
$dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
+    push(@cmds, "$prefix/libtool $ltflags --mode=link $CFG_CC -o $dso_file
-rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
 
     #   execute the commands
     &execute_cmds(@cmds);
@@ -470,8 +470,8 @@
         $t =~ s|^.+/([^/]+)$|$1|;
         $t =~ s|\.la$|\.so|;
         if ($opt_i) {
-           push(@cmds, "$prefix/build/instdso.sh SH_LIBTOOL='" .
-                 "$prefix/build/libtool' $f $CFG_LIBEXECDIR");
+           push(@cmds, "$prefix/instdso.sh SH_LIBTOOL='" .
+                 "$prefix/libtool' $f $CFG_LIBEXECDIR");
            push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
         }