From: Ryan Bloom Date: Thu, 13 Sep 2001 06:49:09 +0000 (+0000) Subject: rules.mk is stored in $(top_blddir). Without this change, VPATH builds X-Git-Tag: 2.0.26~264 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73f768d207ff566907fc1285e0ecdb9fd873f83d;p=apache 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 e52491a832..01e918cac1 100644 --- 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 79d278248f..1320ec2616 100644 --- 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 6850624f70..9b35d49198 100644 --- 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 4f9067714a..bc872a35f4 100644 --- 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 b68fee5cd7..38d6bd3be7 100644 --- 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 cfa33a69ed..84b158b850 100644 --- 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 a96db23d78..5b0e88b08e 100644 --- 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 a4dccbde35..6d83405477 100644 --- 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)