diff /home/plodge/Redhat/testArea/2.4.51.DR1/jbcs-httpd24-2.4/httpd/sbin/apxs /opt/testArea/jbcs1137/jbcs-httpd24-2.4/httpd/sbin/apxs 
20a21,24
> use FindBin;
> use File::Spec;
> 
> $ENV{JBCS_HOME}=defined $ENV{JBCS_HOME} ? $ENV{JBCS_HOME} : "$FindBin::Bin/../..";
26,35d29
< #   are we building in a cross compile environment? If so, destdir contains
< #   the base directory of the cross compiled environment, otherwise destdir
< #   is the empty string.
< 
< my $destdir = "";
< my $ddi = rindex($0, "/opt/rh/jbcs-httpd24/root/usr/bin");
< if ($ddi >= 0) {
<   $destdir = substr($0, 0, $ddi);
< }
< 
38,47d31
< # Awful hack to make apxs libdir-agnostic:
< my $pkg_config = "/usr/bin/pkg-config";
< if (! -x "$pkg_config") {
<     error("$pkg_config not found!");
<     exit(1);
< }
< 
< my $libdir = `pkg-config --variable=libdir apr-1`;
< chomp $libdir;
< 
49,50c33
< 
< get_config_vars($destdir . "$installbuilddir/config_vars.mk",\%config_vars);
---
> get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
65c48
< my $includedir     = $destdir . get_vars("includedir");
---
> my $includedir     = "$ENV{JBCS_HOME}/httpd/include";
68c51
< my $libexecdir     = $destdir . get_vars("libexecdir");
---
> my $libexecdir     = "$ENV{JBCS_HOME}/httpd/modules";
299c282
<     $data =~ s|%LIBDIR%|$libdir|sg;
---
>     $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
477c460
<         my $apr_libs=`$apr_config --cflags --ldflags --link-libtool`;
---
>         my $apr_libs=`$apr_config --cflags --ldflags --link-libtool --libs`;
481c464
<             $apu_libs=`$apu_config --ldflags --link-libtool`;
---
>             $apu_libs=`$apu_config --ldflags --link-libtool --libs`;
525c508
< 	    push(@cmds, $destdir . "$installbuilddir/instdso.sh SH_LIBTOOL='" .
---
> 	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
696,697c679,680
< top_builddir=%LIBDIR%/httpd
< include %LIBDIR%/httpd/build/special.mk
---
> top_builddir=%PREFIX%
> include %INSTALLBUILDDIR%/special.mk