Add rules to Makefile.conf, to rebuild Makefile if $(srcdir)/Makefile.in is

modified.  This also required adding a 'default' target to all Makefiles.

ChangeLog

@@ -1,3 +1,9 @@
+Sun May 19 23:39:02 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * <all Makefile.in>, Makefile.conf.in: Add rules to Makefile.conf, to
+    rebuild Makefile if $(srcdir)/Makefile.in is modified.  This also
+    required adding a 'default' target to all Makefiles.
+
 Sun, 19 May 2002 22:56:41 -0500 Adam Heath <doogie@debian.org>
 
   * utils/md5sum.c: Fairly heavy work(net no lines changed), to fix

Makefile.conf.in

@@ -34,6 +34,13 @@ sysconfdir		= @sysconfdir@
 dpkgconfdir		= $(sysconfdir)/$(PACKAGE)
 alternativesdir		= $(sysconfdir)/alternatives
 
+abs_builddir		= @abs_builddir@
+top_srcdir		= @top_srcdir@
+ifeq ($(strip $(srcdir)),$(strip $(top_srcdir)))
+subdir =
+else
+subdir = $(patsubst $(top_srcdir)/%,%,$(srcdir))/
+endif
 PERL			= @PERL@
 mkinstalldirs		= $(SHELL) $(top_srcdir)/mkinstalldirs
 LN			= @LN_S@
@@ -78,3 +85,10 @@ ALSO_STATIC		= @ALSO_STATIC@
 
 .cc.o:
 	$(CXX) $(ALL_CXXFLAGS) -c $<
+
+Makefile: $(srcdir)/Makefile.in
+	(cd $(abs_builddir);CONFIG_FILES=$(subdir)$@ $(abs_builddir)/config.status)
+
+foobar:
+	@echo "srcdir='$(srcdir)'"
+	@echo "subdir='$(subdir)'"

Makefile.in

@@ -6,6 +6,7 @@ VERSION		= $(shell cat version-nr)
 
 GENFILES	= version.h
 
+default: all
 include Makefile.conf
 
 SUBDIRS		= include optlib lib intl dpkg-deb split scripts utils main \

doc/Makefile.in

@@ -2,6 +2,8 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 
+default: all
+
 include ../Makefile.conf
 
 ifeq (@USE_SGML_DOC@, true)

dpkg-deb/Makefile.in

@@ -5,6 +5,8 @@ top_srcdir	= @top_srcdir@
 top_builddir	= ..
 
 
+default: all
+
 include ../Makefile.conf
 
 

dselect/Makefile.in

@@ -3,6 +3,7 @@ srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 top_builddir	= ..
 
+default: all
 include ../Makefile.conf
 
 CXX_SOURCES	= basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \

include/Makefile.in

@@ -4,6 +4,7 @@ srcdir		= @srcdir@
 
 GENFILES	= dpkg.h
 
+default: all
 include ../Makefile.conf
 
 all:: $(GENFILES)

lib/Makefile.in

@@ -3,6 +3,7 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 
+default: all
 include ../Makefile.conf
 
 SOURCES		= compat.c database.c dbmodify.c dump.c ehandle.c fields.c \

main/Makefile.in

@@ -3,6 +3,7 @@ srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 top_builddir	= ..
 
+default: all
 include ../Makefile.conf
 
 SOURCES		= main.c enquiry.c filesdb.c archives.c processarc.c \

man/Makefile.in

@@ -4,6 +4,7 @@ top_srcdir	= @top_srcdir@
 
 SUBDIRS		= de en fr ja pt_BR ru sv
 
+default: all
 include ../Makefile.conf
 
 clean: clean-recursive

man/de/Makefile.in

@@ -2,6 +2,7 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 deman1dir	= $(subst $(mandir),$(mandir)/de,$(man1dir))

man/en/Makefile.in

@@ -2,6 +2,7 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 MAN5PAGES	= deb-control.5 deb-old.5 deb.5 dpkg.cfg.5 dselect.cfg.5

man/fr/Makefile.in

@@ -2,6 +2,7 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 frman1dir	= $(subst $(mandir),$(mandir)/fr,$(man1dir))

man/ja/Makefile.in

@@ -2,6 +2,7 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 jaman1dir	= $(subst $(mandir),$(mandir)/ja,$(man1dir))

man/pt_BR/Makefile.in

@@ -2,6 +2,7 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 ptman8dir	= $(subst $(mandir),$(mandir)/pt_BR,$(man8dir))

man/ru/Makefile.in

@@ -2,6 +2,7 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 ruman1dir	= $(subst $(mandir),$(mandir)/ru,$(man1dir))

man/sv/Makefile.in

@@ -2,6 +2,7 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 
+default: all
 include ../../Makefile.conf
 
 svman1dir	= $(subst $(mandir),$(mandir)/sv,$(man1dir))

methods/Makefile.in

@@ -2,6 +2,7 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 
+default: all
 include ../Makefile.conf
 
 # Available methods

optlib/Makefile.in

@@ -2,6 +2,7 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 
+default: all
 include ../Makefile.conf
 
 SOURCES		= getopt.c getopt1.c long-options.c closeout.c obstack.c

scripts/Makefile.in

@@ -2,6 +2,7 @@ VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
 
+default: all
 include ../Makefile.conf
 
 BIN_SCRIPTS		= dpkg-name dpkg-source dpkg-genchanges \

split/Makefile.in

@@ -2,8 +2,8 @@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
-top_builddir = ..
 
+default: all
 include ../Makefile.conf
 
 SPLIT_SOURCES		= queue.c split.c info.c join.c main.c

utils/Makefile.in

@@ -2,8 +2,8 @@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 top_srcdir	= @top_srcdir@
-top_builddir	= ..
 
+default: all
 include ../Makefile.conf
 
 CFLAGS			+= -I$(top_srcdir)/optlib