Index: ./Makefile.in
===================================================================
--- ./Makefile.in
+++ ./Makefile.in	Fri Jun 21 19:09:30 2002
@@ -51,6 +51,7 @@
 
 APACHE_INCLUDES = @APACHE_INCLUDES@
 APACHE_TARGET = @APACHE_TARGET@
+APACHE_LIBEXECDIR = @APACHE_LIBEXECDIR@
 
 SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@
 
@@ -70,6 +71,7 @@
 COMPILE_SWIG_PY = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) -DSWIGPYTHON $(CFLAGS) $(SWIG_PY_INCLUDES) $(INCLUDES) -o $@ -c $<
 
 LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) $(LDFLAGS) -rpath $(libdir)
+APMODLINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR)
 
 INSTALL = @INSTALL@
 INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL)
Index: ./ac-helpers/svn-apache.m4
===================================================================
--- ./ac-helpers/svn-apache.m4
+++ ./ac-helpers/svn-apache.m4	Thu Jun 20 20:32:34 2002
@@ -85,6 +85,7 @@
 
     APXS_CC="`$APXS -q CC`"
     APACHE_INCLUDES="$APACHE_INCLUDES -I$APXS_INCLUDE"
+    APACHE_LIBEXECDIR="`$APXS -q libexecdir`"
 
     INSTALL_APACHE_RULE=install-mods-shared
 
@@ -104,6 +105,7 @@
 fi
 AC_SUBST(APACHE_TARGET)
 AC_SUBST(APACHE_INCLUDES)
+AC_SUBST(APACHE_LIBEXECDIR)
 AC_SUBST(BUILD_APACHE_RULE)
 AC_SUBST(INSTALL_APACHE_RULE)
 
Index: ./build/gen_base.py
===================================================================
--- ./build/gen_base.py
+++ ./build/gen_base.py	Fri Jun 21 19:13:50 2002
@@ -177,18 +177,23 @@
       ldflags = self.parser.get(target, 'link-flags')
       add_deps = self.parser.get(target, 'add-deps')
       objnames = string.join(_strip_path(path, objects))
+      custom = self.parser.get(target, 'custom')
+      if custom == 'apache-mod':
+        linkcmd = '$(APMODLINK)'
+      else:
+        linkcmd = '$(LINK)'
+
       self.ofile.write(
         '%s_DEPS = %s %s\n'
         '%s_OBJECTS = %s\n'
         '%s: $(%s_DEPS)\n'
-        '\tcd %s && $(LINK) -o %s %s $(%s_OBJECTS) %s $(LIBS)\n\n'
+        '\tcd %s && %s -o %s %s $(%s_OBJECTS) %s $(LIBS)\n\n'
         % (targ_varname, string.join(objects + deps), add_deps,
            targ_varname, objnames,
            tpath, targ_varname,
-           path, tfile, ldflags, targ_varname, string.join(libs))
+           path, linkcmd, tfile, ldflags, targ_varname, string.join(libs))
         )
 
-      custom = self.parser.get(target, 'custom')
       if custom == 'apache-mod':
         # special build, needing Apache includes
         self.ofile.write('# build these special -- use APACHE_INCLUDES\n')