rpms/ulogd/devel Makefile,1.1,1.2

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

Update of /cvs/extras/rpms/ulogd/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18456

Modified Files:
	Makefile 
Log Message:
Fix Makefile from bad cvs-import


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/ulogd/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	24 Nov 2004 05:01:11 -0000	1.1
+++ Makefile	26 Nov 2004 13:43:29 -0000	1.2
@@ -4,18 +4,18 @@
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f 19271d/Makefile.common ] ; then if [ -f 19271d/CVS/Root -a -w 19271/Makefile.common ] ; then cd 19271d ; cvs -Q update ; fi ; echo "19271d/Makefile.common" ; break ; fi ; done
+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 := 
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
 
-ifeq (,)
+ifeq ($(MAKEFILE_COMMON),)
 # attept a checkout
 define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d 19271(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
+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 := 
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
 endif
 
-include 
+include $(MAKEFILE_COMMON)