20171026 conf/substitutions.conf.franchise (Community-spezifische substitions nach conf/substitutions.conf.franchise zwecks Redundanzvermeidung)

conf/Makefile

@@ -5,12 +5,12 @@ substitutions.sed: substitutions.conf
 	sed -n -E \
 		-e 's@^[[:space:]]*#.*@@' \
 		-e 's@!@\\!@g' \
-		-e 's@^([[:alnum:]_]+)	+(.+)@s!%%\1%%!\2!g@p' \
+		-e 's@^([[:alnum:]_]+)	*(.*)@s!%%\1%%!\2!g@p' \
 		substitutions.conf > $@
 
-substitutions.conf: substitutions.conf.default substitutions.conf.local
+substitutions.conf: substitutions.conf.default substitutions.conf.local substitutions.conf.franchise
 	cp -p substitutions.conf.local $@
-	awk '{ print $$1 }' substitutions.conf.local | fgrep -v -f - substitutions.conf.default >> $@
+	awk '{ print $$1 }' substitutions.conf.local | fgrep -v -h -f - substitutions.conf.default substitutions.conf.franchise >> $@
 
 substitutions.conf.local:
 	[ -e $@ ] || \