From dee4fee2f1cbe08e83f8921a6699a7eb052c3478 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Mon, 16 May 2005 15:44:19 +0000
Subject: [PATCH] Remove all: And install: target clashes with dirs.mk

---
 make/autoconf.mk | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/make/autoconf.mk b/make/autoconf.mk
index 19db1843..7ca62830 100644
--- a/make/autoconf.mk
+++ b/make/autoconf.mk
@@ -4,15 +4,17 @@
 # $Id$
 
 CONFIG_ACDONE := $(wildcard config.acdone)
-CLEAN = $(wildcard *.acdone)
 DISTCLEAN += configure config.log autoscan.log configure.ac config.status
 AC_FILES_IN = $(shell find . -name '*.in' -maxdepth 2 | grep -ve "contrib\|dist\|nomake")
 AC_FILES    = $(basename $(AC_FILES_IN))
 
-all: config $(AC_FILES)
-	if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi
+all: config.acdone make_all
+
+make_all: config $(AC_FILES)
+	if [ -z "$(CONFIG_ACDONE)" ]; then make all; fi
 config: config.acdone $(AC_FILES)
-install: config $(AC_FILES)
+install: config $(AC_FILES) make_install
+make_install:
 	if [ -z "$(CONFIG_ACDONE)" ]; then make $@; fi
 distclean: confclean
 confclean:
@@ -39,3 +41,6 @@ $(TOPDIR)/make/%.mk: $(TOPDIR)/make/%.mk.in config.status
 $(TOPDIR)/include/%.h: $(TOPDIR)/include/%.h.in config.status
 	./config.status $@
 	touch $@
+
+acclean:
+	rm -f *.acdone