Fix apxs -g handling.

Move config_vars.mk from the top build directory to the build directory.
Get build/rules.mk cleaned up for distclean/extraclean.

PR:     10163
        (This is the 2nd of two commits for that PR.  The first was to
        apxs.in -- rev 1.35.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93923 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.cvsignore b/.cvsignore
index ad98298c67d47d62b8fdd3d5832d97477aff3206..ab3e581d74d40fa0711d5ae7613f647e1874d444 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,7 +14,6 @@ shlibtool
 config.status
 modules.c
 config.cache
-config_vars.mk
 .libs
 httpd
 modules.lo

diff --git a/CHANGES b/CHANGES
index 1d2e30bfa8573b07b2e160114ce8cad020b4ba56..ee6605816fbbdfd964cae3fc93bbf42260a11075 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.34-dev
 
+  *) Fix apxs -g handling.  Move config_vars.mk from the top build
+     directory to the build directory.  PR 10163  [Jeff Trawick]
+
   *) Fix some mod_include problems which broke evaluation of some
      expressions.  PR 10108  [Jeff Trawick]
 

diff --git a/Makefile.in b/Makefile.in
index a9a5edce9e94ddcaaa7a756d79cb34ccea881750..3154be0d0c9b8886545fb45a29a312aa3569dc49 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,7 +21,8 @@ INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
        install-build
 
 DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_path.h \
-       modules.c config.cache config.log config.status config_vars.mk
+       modules.c config.cache config.log config.status build/config_vars.mk \
+        build/rules.mk
 EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists
 
 include $(top_builddir)/build/rules.mk
@@ -86,9 +87,9 @@ install-conf:
 install-build:
        @echo Installing build system files 
        @test -d $(installbuilddir) || $(MKINSTALLDIRS) $(installbuilddir) 
-       @sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
-           config_vars.mk > $(installbuilddir)/config_vars.mk; \
-       cp build/*.mk $(installbuilddir); \
+       @cp build/*.mk $(installbuilddir); \
+       sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
+           build/config_vars.mk > $(installbuilddir)/config_vars.mk; \
        cp $(top_srcdir)/build/instdso.sh $(installbuilddir);
 
 htdocs-srcdir = $(top_srcdir)/docs/docroot

diff --git a/acinclude.m4 b/acinclude.m4
index 25c903a3bd5ab235fb788fdc0b0e3792b8fd3fd9..728bff454b8e7c3182021977dddd529e59d97ab1 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -104,9 +104,9 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
 
   APACHE_MKDIR_P_CHECK
   echo creating config_vars.mk
-  > config_vars.mk
+  > build/config_vars.mk
   for i in $APACHE_VAR_SUBST; do
-    eval echo "$i = \$$i" >> config_vars.mk
+    eval echo "$i = \$$i" >> build/config_vars.mk
   done
 ])
 

diff --git a/build/.cvsignore b/build/.cvsignore
index 29d51bb51c690314a78587cbac0529063795cfec..48698eb14e28bf54334e82f0793c748b34bc7503 100644 (file)
--- a/build/.cvsignore
+++ b/build/.cvsignore
@@ -1 +1,2 @@
 rules.mk
+config_vars.mk

diff --git a/build/rules.mk.in b/build/rules.mk.in
index 9c57020f6b0d29026b70e98ae554387010194de5..bd427a6fedc14f0c1ad7d866b4950d6a12099866 100644 (file)
--- a/build/rules.mk.in
+++ b/build/rules.mk.in
@@ -54,7 +54,7 @@
 # The build environment was originally provided by Sascha Schumann.
 #
 
-include $(top_builddir)/config_vars.mk
+include $(top_builddir)/build/config_vars.mk
 
 # Combine all of the flags together in the proper order so that
 # the user-defined flags can always override the configure ones, if needed.