summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2020-02-01 22:07:18 +0000
committermidipix <writeonce@midipix.org>2020-02-01 22:24:37 +0000
commit1697f44e77c320007258f7dd7a485b6c28631026 (patch)
tree5f175b8bb1b2154d8d728be1be600909a2c714d1
parent01ddc0383a29ec23b773b968e878c6cac5ecc2b8 (diff)
downloadbautomake-1697f44e77c320007258f7dd7a485b6c28631026.tar.bz2
bautomake-1697f44e77c320007258f7dd7a485b6c28631026.tar.xz
project: added logic for installation of (internal) m4 config files.
-rw-r--r--project/config/cfgdefs.sh11
-rw-r--r--project/install.mk6
2 files changed, 17 insertions, 0 deletions
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