From 5ed84259487fd0fb7c9b32532e0025e4ca371538 Mon Sep 17 00:00:00 2001 From: midipix Date: Fri, 24 Jan 2020 23:52:50 +0000 Subject: project: cfgdefs.sh: refactor references to the rawball manifest file. --- project/config/cfgdefs.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'project') diff --git a/project/config/cfgdefs.sh b/project/config/cfgdefs.sh index 4e3cf18..9f327fa 100644 --- a/project/config/cfgdefs.sh +++ b/project/config/cfgdefs.sh @@ -12,6 +12,7 @@ # finally, cfgdefs.sh may update the contents of the # config-time generated cfgdefs.mk. +mb_manifest=MANIFEST.rawball for arg ; do case "$arg" in @@ -75,7 +76,7 @@ cfgdefs_output_source_lists() >> "$mb_pwd/cfgdefs.mk" printf '\t$(SOURCE_DIR)/%s \\\n' \ - $(grep '/m4/' "$mb_source_dir"/MANIFEST.RAWBALL \ + $(grep '/m4/' "$mb_source_dir/$mb_manifest" \ | grep -v -e '/acdir/' -e '/internal/' \ | grep -v -e '/amversion.in' \ | cut -d' ' -f3) \ @@ -86,9 +87,9 @@ cfgdefs_output_source_lists() printf '\n\nAUTOMAKE_AM_SOURCE_FILES = \\\n' \ >> "$mb_pwd/cfgdefs.mk" - printf '\t$(SOURCE_DIR)/%s \\\n' \ - $(grep '/am/' "$mb_source_dir"/MANIFEST.RAWBALL \ - | cut -d' ' -f3) \ + printf '\t$(SOURCE_DIR)/%s \\\n' \ + $(grep '/am/' "$mb_source_dir/$mb_manifest" \ + | cut -d' ' -f3) \ >> "$mb_pwd/cfgdefs.mk" @@ -97,7 +98,7 @@ cfgdefs_output_source_lists() >> "$mb_pwd/cfgdefs.mk" printf '\t$(SOURCE_DIR)/%s \\\n' \ - $(grep '/Automake/' "$mb_source_dir"/MANIFEST.RAWBALL \ + $(grep '/Automake/' "$mb_source_dir/$mb_manifest" \ | cut -d' ' -f3) \ >> "$mb_pwd/cfgdefs.mk" @@ -107,7 +108,7 @@ cfgdefs_output_source_lists() >> "$mb_pwd/cfgdefs.mk" printf '\t$(SOURCE_DIR)/%s \\\n' \ - $(grep '/lib/' "$mb_source_dir"/MANIFEST.RAWBALL \ + $(grep '/lib/' "$mb_source_dir/$mb_manifest" \ | grep -v -e '/am/' -e '/Automake/' \ | cut -d' ' -f3) \ >> "$mb_pwd/cfgdefs.mk" -- cgit v1.2.3