From 6644ec28e463fe6f33e447a895767dafb389d220 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 16 Aug 2007 22:11:17 +0000 Subject: [PATCH] topdir.mk: Fix build breakage Remove rpmdist.mk and reshuffle include defs.mk inclusion to get it to build again. --- make/topdir.mk | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/make/topdir.mk b/make/topdir.mk index c4789571..df602964 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -10,9 +10,14 @@ ifneq ($(wildcard $(TOPDIR)/make/defs.mk),) include $(MODDIR)/make/defs.mk include $(MODDIR)/make/rpmdist.mk --include $(TOPDIR)/make/rpmdist.mk include $(MODDIR)/make/subdirs.mk +endif + +ifneq ($(wildcard $(TOPDIR)/make/defs.mk.in),) +include $(MODDIR)/make/autoconf.mk +endif + local-%: find . -name $@.mk | \ while read f; do (\ @@ -30,10 +35,3 @@ topdir.distclean: topdir.clean: rm -f $(CLEAN) -endif - -ifneq ($(wildcard $(TOPDIR)/make/defs.mk.in),) - include $(MODDIR)/make/autoconf.mk -endif - -