[DRBD-cvs] drbd by lars; avoid al_extent == 0

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Wed, 19 May 2004 21:52:52 +0200 (CEST)


DRBD CVS committal

Author  : lars
Module  : drbd

Dir     : drbd


Modified Files:
      Tag: rel-0_7-branch
	Makefile 


Log Message:
avoid al_extent == 0
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/Makefile,v
retrieving revision 1.11.2.17
retrieving revision 1.11.2.18
diff -u -3 -r1.11.2.17 -r1.11.2.18
--- Makefile	19 May 2004 10:13:11 -0000	1.11.2.17
+++ Makefile	19 May 2004 19:52:47 -0000	1.11.2.18
@@ -21,7 +21,12 @@
 
 SUBDIRS     = user drbd scripts benchmark documentation #testing
 ALLSUBDIRS  = user drbd scripts benchmark documentation testing
-REL_VERSION = $(shell sed -ne '/REL_VERSION/{s/^.*"\(.*\) cvs .*/\1/;p;q;}' drbd/linux/drbd_config.h)
+ifdef FORCE
+REL_VERSION := $(shell sed -ne '/REL_VERSION/{s/^.*"\(.*\) cvs .Date: \(.\{10\}\).*/\1-\2/;s,/,,g;p;q;}' drbd_config.h)
+else
+REL_VERSION := $(shell sed -ne '/REL_VERSION/{s/^.*"\(.*\) cvs .*/\1/;p;q;}' drbd/linux/drbd_config.h)
+endif
+DIST_VERSION := $(subst -,_,$(REL_VERSION))
 
 LN_S = ln -s
 RPMBUILD=rpmbuild
@@ -59,7 +64,6 @@
 uninstall:
 	@ set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i uninstall; done
 
-DIST_VERSION=$(subst -,_,$(REL_VERSION))
 check_changelogs_up2date:
 	@ up2date=true; dver_re=$(DIST_VERSION); dver_re=$${dver_re//./\\.}; \
 	in_changelog=$$(sed -n -e '0,/^%changelog/d' \