rules.mk is stored in $(top_blddir). Without this change, VPATH builds

stop working.

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

diff --git a/Makefile.in b/Makefile.in
index e52491a83295b2e7ef55171d2e323c2f4ad5f4f4..01e918cac125ce67dce2207a173bdc2bae64eb58 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,7 +24,7 @@ DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_path.h \
        modules.c config.cache config.log config.status config_vars.mk
 EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists
 
-include $(top_srcdir)/build/rules.mk
+include $(top_builddir)/build/rules.mk
 include $(top_srcdir)/build/program.mk
 
 install-conf:

diff --git a/modules/Makefile.in b/modules/Makefile.in
index 79d278248fe2eca9a4c3376119d2110cb38d73d1..1320ec26162e528c3e3cfb7134caf633c49cee6e 100644 (file)
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -2,5 +2,5 @@
 SUBDIRS = $(MODULE_DIRS)
 CLEAN_SUBDIRS = $(MODULE_CLEANDIRS)
 
-include $(top_srcdir)/build/rules.mk
+include $(top_builddir)/build/rules.mk
 

diff --git a/os/Makefile.in b/os/Makefile.in
index 6850624f7015e316e785e45c5e0fa0873ef3cba6..9b35d4919827b608470d43291aac4651cd12c4d2 100644 (file)
--- a/os/Makefile.in
+++ b/os/Makefile.in
@@ -1,4 +1,4 @@
 
 SUBDIRS = $(OS_DIR)
 
-include $(top_srcdir)/build/rules.mk
+include $(top_builddir)/build/rules.mk

diff --git a/server/Makefile.in b/server/Makefile.in
index 4f9067714aedc0cb713b5bc17c32d7305dfaf72c..bc872a35f42f986a68202422f4c6e537ab0140cf 100644 (file)
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -19,7 +19,7 @@ LTLIBRARY_SOURCES = \
 
 TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h httpd.exp
 
-include $(top_srcdir)/build/rules.mk
+include $(top_builddir)/build/rules.mk
 include $(top_srcdir)/build/library.mk
 
 gen_test_char_OBJECTS = gen_test_char.lo util_debug.lo

diff --git a/server/mpm/Makefile.in b/server/mpm/Makefile.in
index b68fee5cd722f28150d5ffba669cf1e0a2686adb..38d6bd3be7fdb36e312a0064f4d49b942064d985 100644 (file)
--- a/server/mpm/Makefile.in
+++ b/server/mpm/Makefile.in
@@ -1,4 +1,4 @@
 
 SUBDIRS = $(MPM_NAME)
 
-include $(top_srcdir)/build/rules.mk
+include $(top_builddir)/build/rules.mk

diff --git a/srclib/Makefile.in b/srclib/Makefile.in
index cfa33a69edf459a07da16d59759f13b1dfc12289..84b158b850d95a81a4ea21b5b120b66427840fd0 100644 (file)
--- a/srclib/Makefile.in
+++ b/srclib/Makefile.in
@@ -3,4 +3,4 @@ SUBDIRS = $(AP_LIB_DIRS) pcre
 BUILD_SUBDIRS = apr apr-util
 CLEAN_SUBDIRS = apr-util apr
 
-include $(top_srcdir)/build/rules.mk
+include $(top_builddir)/build/rules.mk

diff --git a/support/Makefile.in b/support/Makefile.in
index a96db23d78c1c4c888e8e614887a5f6c01460248..5b0e88b08e262a405831793d0766059ae79834f1 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -9,7 +9,7 @@ PROGRAM_DEPENDENCIES = \
        $(top_builddir)/srclib/apr-util/libaprutil.la \
        $(top_builddir)/srclib/apr/libapr.la
 
-include $(top_srcdir)/build/rules.mk
+include $(top_builddir)/build/rules.mk
 
 install:
        @test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)

diff --git a/test/Makefile.in b/test/Makefile.in
index a4dccbde354f7696734bf85b61b1d39a54650bef..6d834054773e17a75aa6337056a1ee8125983aa9 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -10,7 +10,7 @@ PROGRAM_DEPENDENCIES =  \
        $(top_srcdir)/srclib/apr-util/libaprutil.la \
        $(top_srcdir)/srclib/apr/libapr.la
 
-include $(top_srcdir)/build/rules.mk
+include $(top_builddir)/build/rules.mk
 
 test: $(PROGRAMS)