summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@fedoraproject.org>2007-10-15 18:52:20 +0000
committerBill Nottingham <notting@fedoraproject.org>2007-10-15 18:52:20 +0000
commit4e3b0ac8c983077782d3db99fd45d0780f3d4495 (patch)
tree7cf1708a2b0a4a496ce9db2056f883e83867e1b5
parent12462ec8f484403d2bc15c9172351b71b06c9953 (diff)
downloadhttpd-4e3b0ac8c983077782d3db99fd45d0780f3d4495.tar.gz
httpd-4e3b0ac8c983077782d3db99fd45d0780f3d4495.tar.xz
httpd-4e3b0ac8c983077782d3db99fd45d0780f3d4495.zip
makefile update to properly grab makefile.commonF-8-startF-8-split
-rw-r--r--Makefile19
1 files changed, 17 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 279b036..24877f5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,25 @@
# Makefile for source rpm: httpd
-# $Id: Makefile,v 1.2 2005/11/30 12:50:30 jorton Exp $
+# $Id: Makefile,v 1.8 2005/12/02 10:42:59 jorton Exp $
NAME := httpd
SPECFILE = $(firstword $(wildcard *.spec))
UPSTREAM_CHECKS = asc
-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)
migration.html: migration.xml html.xsl
xmlto -x html.xsl html-nochunks migration.xml