From 1697f44e77c320007258f7dd7a485b6c28631026 Mon Sep 17 00:00:00 2001 From: midipix Date: Sat, 1 Feb 2020 22:07:18 +0000 Subject: project: added logic for installation of (internal) m4 config files. --- project/config/cfgdefs.sh | 11 +++++++++++ project/install.mk | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/project/config/cfgdefs.sh b/project/config/cfgdefs.sh index 4cf1ebc..2e9416c 100644 --- a/project/config/cfgdefs.sh +++ b/project/config/cfgdefs.sh @@ -126,6 +126,17 @@ cfgdefs_output_source_lists() >> "$mb_pwd/cfgdefs.mk" printf '\n\n' >> "$mb_pwd/cfgdefs.mk" + + + # m4 config files + printf '\n\nAUTOMAKE_CFG_SOURCE_FILES = \\\n' \ + >> "$mb_pwd/cfgdefs.mk" + + printf '\t$(SOURCE_DIR)/%s \\\n' \ + $(grep '/m4/internal/' "$mb_source_dir/$mb_manifest" \ + | cut -d' ' -f3) \ + >> "$mb_pwd/cfgdefs.mk" + } diff --git a/project/install.mk b/project/install.mk index 2049492..4d91dd7 100644 --- a/project/install.mk +++ b/project/install.mk @@ -3,6 +3,7 @@ AUTOMAKE_DEST_AC_DIR = $(DESTDIR)$(DATADIR)/aclocal AUTOMAKE_DEST_M4_DIR = $(DESTDIR)$(DATADIR)/aclocal-$(AUTOMAKE_VER) +AUTOMAKE_DEST_CFG_DIR = $(DESTDIR)$(DATADIR)/aclocal-$(AUTOMAKE_VER)/internal AUTOMAKE_DEST_AM_DIR = $(DESTDIR)$(DATADIR)/automake-$(AUTOMAKE_VER)/am AUTOMAKE_DEST_PM_DIR = $(DESTDIR)$(DATADIR)/automake-$(AUTOMAKE_VER)/Automake AUTOMAKE_DEST_LIB_DIR = $(DESTDIR)$(DATADIR)/automake-$(AUTOMAKE_VER) @@ -46,6 +47,10 @@ install-pm-gen-files: $(LIB_GEN_SRCS) mkdir -p $(AUTOMAKE_DEST_PM_DIR) cp -p $(LIB_GEN_SRCS) $(AUTOMAKE_DEST_PM_DIR) +install-cfg-files: + mkdir -p $(AUTOMAKE_DEST_CFG_DIR) + cp -p $(AUTOMAKE_CFG_SOURCE_FILES) $(AUTOMAKE_DEST_CFG_DIR) + install-bin-files: $(BIN_GEN_SRCS) mkdir -p $(AUTOMAKE_DEST_BIN_DIR) cp -p $(BIN_GEN_SRCS) $(AUTOMAKE_DEST_BIN_DIR) @@ -59,6 +64,7 @@ install: install-m4-files install: install-am-files install: install-pm-files +install: install-cfg-files install: install-lib-files install: install-man-files install: install-bin-files -- cgit v1.2.3