summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@fedoraproject.org>2007-10-15 18:43:03 +0000
committerBill Nottingham <notting@fedoraproject.org>2007-10-15 18:43:03 +0000
commita5f198ad195b6d72f8e5be81aa4e8cbd35889b17 (patch)
tree300ae3fc0594a1ca00211a93ca2b8dee309ecfe3
parent0ea033fa4b82be0c2f238cf08ad7fb2908fbae4e (diff)
downloade2fsprogs-a5f198ad195b6d72f8e5be81aa4e8cbd35889b17.tar.gz
e2fsprogs-a5f198ad195b6d72f8e5be81aa4e8cbd35889b17.tar.xz
e2fsprogs-a5f198ad195b6d72f8e5be81aa4e8cbd35889b17.zip
makefile update to properly grab makefile.commonF-8-split
-rw-r--r--Makefile17
1 files changed, 16 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f6a7f19..268b48d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,4 +3,19 @@
NAME := e2fsprogs
SPECFILE = $(firstword $(wildcard *.spec))
-include ../common/Makefile.common
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)