devel/xorg-x11-server Makefile,1.2,1.3

Bill Nottingham (notting) fedora-extras-commits at redhat.com
Mon Oct 15 19:40:23 UTC 2007


Author: notting

Update of /cvs/extras/devel/xorg-x11-server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4993/xorg-x11-server

Modified Files:
	Makefile 
Log Message:
makefile update to properly grab makefile.common



Index: Makefile
===================================================================
RCS file: /cvs/extras/devel/xorg-x11-server/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	12 Feb 2007 21:55:45 -0000	1.2
+++ Makefile	15 Oct 2007 19:37:15 -0000	1.3
@@ -3,7 +3,22 @@
 NAME := xorg-x11-server
 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)
 
 me a:
 	@:




More information about the fedora-extras-commits mailing list