diff options
| -rw-r--r-- | project/config/cfgdefs.sh | 13 | ||||
| -rw-r--r-- | project/extras.mk | 18 |
2 files changed, 22 insertions, 9 deletions
diff --git a/project/config/cfgdefs.sh b/project/config/cfgdefs.sh index 6510abd..20c89b1 100644 --- a/project/config/cfgdefs.sh +++ b/project/config/cfgdefs.sh @@ -28,6 +28,10 @@ _mb_quotes='\"' for arg ; do case "$arg" in + --m4-dir=*) + m4_dir=${arg#*=} + ;; + --with-preferred-host-ar=*) slbt_preferred_host_ar=${_mb_quotes}${arg#*=}${_mb_quotes} ;; @@ -52,11 +56,20 @@ done cfgdefs_output_custom_defs() { + if [ -z "${m4_dir:-}" ]; then + m4_dir="${mb_datadir}/${mb_package}" + fi + if [ $mb_cfgtest_cfgtype = 'host' ]; then cfgtest_cflags_append -DSLBT_PREFERRED_HOST_AR=${slbt_preferred_host_ar:-0} cfgtest_cflags_append -DSLBT_PREFERRED_HOST_AS=${slbt_preferred_host_as:-0} cfgtest_cflags_append -DSLBT_PREFERRED_HOST_NM=${slbt_preferred_host_nm:-0} cfgtest_cflags_append -DSLBT_PREFERRED_HOST_RANLIB=${slbt_preferred_host_ranlib:-0} + + cfgtest_newline + cfgtest_comment '# m4,aux' + mb_cfgtest_makevar='M4_DIR' + cfgtest_makevar_set "$m4_dir" fi } diff --git a/project/extras.mk b/project/extras.mk index 674da1e..04802df 100644 --- a/project/extras.mk +++ b/project/extras.mk @@ -104,14 +104,14 @@ install-app-extras: mv bin/$(STOOLIE)$(OS_APP_SUFFIX).tmp $(DESTDIR)$(BINDIR)/$(STOOLIE)$(OS_APP_SUFFIX) install-slibtoolize: - mkdir -p $(DESTDIR)$(DATADIR)/$(PACKAGE) - - cp -p $(SOURCE_DIR)/m4/slibtool.m4 $(DESTDIR)$(DATADIR)/$(PACKAGE) - cp -p $(SOURCE_DIR)/m4/sltdl.m4 $(DESTDIR)$(DATADIR)/$(PACKAGE) - cp -p $(SOURCE_DIR)/aux/ltmain.sh $(DESTDIR)$(DATADIR)/$(PACKAGE) - cp -p $(SOURCE_DIR)/aux/slibtool.sh $(DESTDIR)$(DATADIR)/$(PACKAGE) - cp -p $(SOURCE_DIR)/aux/ar-lib $(DESTDIR)$(DATADIR)/$(PACKAGE) - cp -p $(SOURCE_DIR)/aux/sltdl.h.in $(DESTDIR)$(DATADIR)/$(PACKAGE) - cp -p $(SOURCE_DIR)/aux/sltdl.mk.in $(DESTDIR)$(DATADIR)/$(PACKAGE) + mkdir -p $(DESTDIR)$(M4_DIR) + + cp -p $(SOURCE_DIR)/m4/slibtool.m4 $(DESTDIR)$(M4_DIR) + cp -p $(SOURCE_DIR)/m4/sltdl.m4 $(DESTDIR)$(M4_DIR) + cp -p $(SOURCE_DIR)/aux/ltmain.sh $(DESTDIR)$(M4_DIR) + cp -p $(SOURCE_DIR)/aux/slibtool.sh $(DESTDIR)$(M4_DIR) + cp -p $(SOURCE_DIR)/aux/ar-lib $(DESTDIR)$(M4_DIR) + cp -p $(SOURCE_DIR)/aux/sltdl.h.in $(DESTDIR)$(M4_DIR) + cp -p $(SOURCE_DIR)/aux/sltdl.mk.in $(DESTDIR)$(M4_DIR) .PHONY: install-slibtoolize |