Browse Source

- don't iterate during version table generation over the version table..
- head with negative index is not available on *BSD, use positive instead


git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3009 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt 18 years ago
parent
commit
11ea23e939
1 changed files with 10 additions and 6 deletions
  1. 10 6
      lib/srdb1/schema/Makefile

+ 10 - 6
lib/srdb1/schema/Makefile

@@ -102,9 +102,11 @@ dbtext:
 	# small hack to create the version table entries, this is here easier as with XSL
 	for FILE in  $(wildcard $(ROOT)/scripts/dbtext/openser/*) ; do \
 		if [ -f "$$FILE" ]; then \
-			tail -n 1 "$$FILE" >> "$(ROOT)/scripts/dbtext/openser/version" ; \
- 			head -n -1 "$$FILE" > /tmp/openser-dbtext.tmp ; \
-			cp /tmp/openser-dbtext.tmp "$$FILE" ; \
+			if [  "$$FILE" != "$(ROOT)/scripts/dbtext/openser/version" ]; then \
+				tail -n 1 "$$FILE" >> "$(ROOT)/scripts/dbtext/openser/version" ; \
+ 				head -n 1 "$$FILE" > /tmp/openser-dbtext.tmp ; \
+				cp /tmp/openser-dbtext.tmp "$$FILE" ; \
+			fi ; \
 		fi ; \
 	done ; \
 	rm -f /tmp/openser-dbtext.tmp
@@ -124,9 +126,11 @@ db_berkeley:
 	# small hack to create the version table entries, this is here easier as with XSL
 	for FILE in  $(wildcard $(ROOT)/scripts/db_berkeley/openser/*) ; do \
 		if [ -f "$$FILE" ]; then \
-			tail -n 2 "$$FILE" >> "$(ROOT)/scripts/db_berkeley/openser/version" ; \
- 			head -n -2 "$$FILE" > /tmp/openser-db_berkeley.tmp ; \
-			cp /tmp/openser-db_berkeley.tmp "$$FILE" ; \
+			if [  "$$FILE" != "$(ROOT)/scripts/db_berkeley/openser/version" ]; then \
+				tail -n 2 "$$FILE" >> "$(ROOT)/scripts/db_berkeley/openser/version" ; \
+ 				head -n 8 "$$FILE" > /tmp/openser-db_berkeley.tmp ; \
+				cp /tmp/openser-db_berkeley.tmp "$$FILE" ; \
+			fi ; \
 		fi ; \
 	done ; \
 	rm -f /tmp/openser-db_berkeley.tmp