From f41f183f628a148860a6d1f0070208cddd45b0c6 Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Sat, 12 Dec 1998 02:00:01 +0000 Subject: [PATCH] fix srcdir problems --- Makefile.in | 4 ++++ bin/Makefile.in | 4 ++++ bin/tests/Makefile.in | 4 ++++ lib/Makefile.in | 2 -- lib/dns/Makefile.in | 4 ++++ lib/dns/include/Makefile.in | 4 ++++ lib/dns/include/dns/Makefile.in | 4 ++++ lib/isc/Makefile.in | 4 ++++ lib/isc/include/Makefile.in | 2 -- lib/isc/include/isc/Makefile.in | 8 -------- lib/isc/pthreads/Makefile.in | 4 ++++ lib/isc/pthreads/include/Makefile.in | 4 ++++ lib/isc/pthreads/include/isc/Makefile.in | 4 ++++ lib/isc/unix/Makefile.in | 4 ++++ lib/isc/unix/include/Makefile.in | 4 ++++ lib/isc/unix/include/isc/Makefile.in | 4 ++++ make/Makefile.in | 4 ++++ make/rules.in | 5 ++--- 18 files changed, 58 insertions(+), 15 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9a82e5ca31..9ff95fb2fa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + @BIND9_VERSION@ SUBDIRS = make lib bin diff --git a/bin/Makefile.in b/bin/Makefile.in index 37e472aba4..2fe2a7f932 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + SUBDIRS = tests TARGETS = diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in index dedd92c789..6da9390aba 100644 --- a/bin/tests/Makefile.in +++ b/bin/tests/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + CINCLUDES = -I${srcdir}/../../lib/isc/unix/include \ -I${srcdir}/../../lib/isc/pthreads/include \ -I${srcdir}/../../lib/isc/include \ diff --git a/lib/Makefile.in b/lib/Makefile.in index aca552f1cb..fc7f3add03 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -3,8 +3,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@SET_MAKE@ - SUBDIRS = isc dns TARGETS = diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index 611c7ebf3e..8e2e509eb7 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + @BIND9_VERSION@ CINCLUDES = -I${srcdir}/../isc/unix/include \ diff --git a/lib/dns/include/Makefile.in b/lib/dns/include/Makefile.in index 09b942de01..0e3f0c8a55 100644 --- a/lib/dns/include/Makefile.in +++ b/lib/dns/include/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + SUBDIRS = dns TARGETS = diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in index 67ddc76089..5ad28e2506 100644 --- a/lib/dns/include/dns/Makefile.in +++ b/lib/dns/include/dns/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + @BIND9_VERSION@ HEADERS = name.h result.h types.h diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in index dee2297eeb..c6afeb18f1 100644 --- a/lib/isc/Makefile.in +++ b/lib/isc/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + @BIND9_VERSION@ CINCLUDES = -I${srcdir}/unix/include \ diff --git a/lib/isc/include/Makefile.in b/lib/isc/include/Makefile.in index c59cec4e5f..684b2d07cb 100644 --- a/lib/isc/include/Makefile.in +++ b/lib/isc/include/Makefile.in @@ -3,8 +3,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -@SET_MAKE@ - SUBDIRS = isc TARGETS = diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in index 64051abb52..afacb0b5ab 100644 --- a/lib/isc/include/isc/Makefile.in +++ b/lib/isc/include/isc/Makefile.in @@ -2,17 +2,9 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ -includedir = @includedir@ - -@SET_MAKE@ @BIND9_VERSION@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ - HEADERS = assertions.h boolean.h buffer.h error.h event.h heap.h \ list.h mem.h rbtgen.h region.h result.h rwlock.h socket.h \ task.h timer.h diff --git a/lib/isc/pthreads/Makefile.in b/lib/isc/pthreads/Makefile.in index 8540502713..8a0f65609d 100644 --- a/lib/isc/pthreads/Makefile.in +++ b/lib/isc/pthreads/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + CINCLUDES = -I${srcdir}/include \ -I${srcdir}/../unix/include \ -I${srcdir}/../include diff --git a/lib/isc/pthreads/include/Makefile.in b/lib/isc/pthreads/include/Makefile.in index 9222f99950..684b2d07cb 100644 --- a/lib/isc/pthreads/include/Makefile.in +++ b/lib/isc/pthreads/include/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + SUBDIRS = isc TARGETS = diff --git a/lib/isc/pthreads/include/isc/Makefile.in b/lib/isc/pthreads/include/isc/Makefile.in index cc035828d6..7b07d2c052 100644 --- a/lib/isc/pthreads/include/isc/Makefile.in +++ b/lib/isc/pthreads/include/isc/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + @BIND9_VERSION@ HEADERS = condition.h mutex.h thread.h diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in index f37d3d33b1..76374eaa94 100644 --- a/lib/isc/unix/Makefile.in +++ b/lib/isc/unix/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + CINCLUDES = -I${srcdir}/include \ -I${srcdir}/../pthreads/include \ -I${srcdir}/../include diff --git a/lib/isc/unix/include/Makefile.in b/lib/isc/unix/include/Makefile.in index 9222f99950..684b2d07cb 100644 --- a/lib/isc/unix/include/Makefile.in +++ b/lib/isc/unix/include/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + SUBDIRS = isc TARGETS = diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in index 3e79716b5b..0ab121055c 100644 --- a/lib/isc/unix/include/isc/Makefile.in +++ b/lib/isc/unix/include/isc/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + @BIND9_VERSION@ HEADERS = time.h diff --git a/make/Makefile.in b/make/Makefile.in index a11872a98b..4b6bba5329 100644 --- a/make/Makefile.in +++ b/make/Makefile.in @@ -1,4 +1,8 @@ +srcdir = @srcdir@ +VPATH = @srcdir@ +top_srcdir = @top_srcdir@ + SUBDIRS= TARGETS= diff --git a/make/rules.in b/make/rules.in index 04a079746d..52a7492e30 100644 --- a/make/rules.in +++ b/make/rules.in @@ -5,10 +5,9 @@ ### ### Paths ### +### Note: paths that vary by Makefile MUST NOT be listed +### here, or they won't get expanded correctly. -srcdir = @srcdir@ -VPATH = @srcdir@ -top_srcdir = @top_srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@