From 927e20799fadfee43a4d903cc7eba5015dfe1f69 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 27 Mar 2000 04:00:04 +0000
Subject: [PATCH] clean up the configure section a little. basicly merge
 redundant rules.

---
 Makefile.in | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 83727d7..3f7f79d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,16 +16,6 @@ all: Makefile
 	$(MAKE) -C $$dir $@ || exit; \
 	done
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-config.status: $(srcdir)/configure
-	$(SHELL) ./config.status --recheck
-
-$(srcdir)/configure: $(srcdir)/configure.in
-		(cd $(srcdir) && autoconf || true)
-
 distclean:
 	rm -f config.cache config.log config.status Makefile
 	rm -f common/config.h
@@ -57,16 +47,17 @@ changelog:
 
 # Code to automatically re-configure, only runs if you are compiling in the
 # source directory
-ifeq ($(srcdir),.)
-configure: configure.in acconfig.h
-	./bootstrap
+
+config.status: $(srcdir)/configure
+	$(SHELL) ./config.status --recheck
+
+$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/acconfig.h
+		(cd $(srcdir) && ./bootstrap || true)
 
 CONFIG_SRC    = Makefile.in Rules.mk.in qw_client/Makefile.in \
 		qw_server/Makefile.in uquake/Makefile.in common/Makefile.in \
 		rpm/build_rpm.in rpm/quakeforge.spec.in
 
-$(patsubst %.in,%,$(CONFIG_SRC)): configure $(CONFIG_SRC)
+$(patsubst %.in,%,$(CONFIG_SRC)): configure $(patsubst %.in,$(srcdir)/%.in,$(CONFIG_SRC))
 	$(SHELL) ./config.status --recheck
 	$(SHELL) ./config.status
-
-endif