httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Thom May <t...@planetarytramp.net>
Subject Re: APXS hard-coded paths
Date Tue, 12 Mar 2002 23:46:28 GMT
* Thom May (thom@planetarytramp.net) wrote :
> * Olof Oberg (mill@pedgr571.sn.umu.se) wrote :
> > Hi, 
> > 
> > trying to write my first module I used apxs to generate the Makefile.
> > 
> >  apxs -g -n ion
> > 
> > Problem is that apxs.in has the following defined 
> > 
> >  top_srcdir=/home/rbb/apachebin4
> >  top_builddir=/home/rbb/apachebin4/build
> >  include /home/rbb/apachebin4/build/special.mk
> > 
> > which naturally isn't applicable on my environment.
> > 
> > Not knowing how the build system works exactly I tried to figure 
> > things out. 
> > 
> > If one assumes top_builddir is the build/ directory of the installed 
> > apache (/data/local/apache/build) then the following conflict occurs:
> > 
> >  special.mk includes $(top_builddir)/rules.mk
> > and 
> >  rules.mk includes $(top_builddir)/build/config_vars.mk
> > 
> > Both those files are of course in build/. 
> > 
> > To not cause any confusion this is a CVS HEAD installation.
> > 
> > Btw, apxs 1.3 doesn't include any files.
> > 
> Hi, 
> I'm hoping to get time this evening to finish my changes to apxs as Aaron
> and I set out last week - this _should_ eliminate this problem, but I'll be
> sure to test it.
> Cheers,
> -Thom
> 
OK, this is not the full on apxs fix up, but a smaller patch to get rid of
the hard coded paths.
-Thom

Index: support/apxs.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/support/apxs.in,v
retrieving revision 1.34
diff -u -u -3 -r1.34 apxs.in
--- support/apxs.in     1 Feb 2002 19:25:14 -0000       1.34
+++ support/apxs.in     12 Mar 2002 23:43:29 -0000
@@ -66,7 +66,7 @@

 # read the configuration variables once
 my %config_vars = ();
-get_config_vars("$prefix/build/config_vars.mk",\%config_vars);
+get_config_vars("@installbuilddir@/config_vars.mk",\%config_vars);

 my $exec_prefix    = get_vars("exec_prefix");
 my $CFG_TARGET     = get_vars("progname");
@@ -586,9 +586,9 @@
 ##

 builddir=$(shell pwd)
-top_srcdir=/home/rbb/apachebin4
-top_builddir=/home/rbb/apachebin4/build
-include /home/rbb/apachebin4/build/special.mk
+top_srcdir=@abs_srcdir@
+top_builddir=@installbuilddir@
+include ${top_builddir}/special.mk

 #   the used tools
 APXS=apxs

Mime
View raw message