diff options
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rwxr-xr-x | configure | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 4597694..c59ea64 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,6 +45,7 @@ DOCDIR := @@DOCDIR@@ MANDIR := @@MANDIR@@ PROG_PFX:=@@PROG_PFX@@ PROG_SFX:=@@PROG_SFX@@ +PROG_SED:=@@PROG_SED@@ DATE := @@DATE@@ LOCAL := @@LOCAL@@ @@ -68,7 +69,7 @@ KCONFIG:= @@KCONFIG@@ MAN_SECTION := 1 MAN_SUBDIR := /man$(MAN_SECTION) -PROG_NAME := $(PROG_PFX)ct-ng$(PROG_SFX) +PROG_NAME := $(shell echo '$(PROG_PFX)ct-ng$(PROG_SFX)' |sed -e '$(PROG_SED)' ) ############################################################################### # Sanity checks @@ -151,6 +152,7 @@ define sed_it -e 's,@@CT_MANDIR@@,$(MANDIR),g;' \ -e 's,@@CT_PROG_PFX@@,$(PROG_PFX),g;' \ -e 's,@@CT_PROG_SFX@@,$(PROG_SFX),g;' \ + -e 's,@@CT_PROG_SED@@,$(PROG_SED),g;' \ -e 's,@@CT_PROG_NAME@@,$(PROG_NAME),g;' \ -e 's,@@CT_VERSION@@,$(VERSION),g;' \ -e 's,@@CT_DATE@@,$(DATE),g;' \ @@ -162,7 +164,7 @@ endef docs/$(PROG_NAME).1: docs/ct-ng.1.in Makefile $(call sed_it) -$(PROG_PFX)%$(PROG_SFX): %.in Makefile +$(PROG_NAME): ct-ng.in Makefile $(call sed_it) %: %.in Makefile @@ -13,6 +13,7 @@ DOCDIR_set= MANDIR_set= PROG_PFX= PROG_SFX= +PROG_SED= LOCAL_set= FORCE= @@ -68,6 +69,9 @@ set_program_prefix() { set_program_suffix() { PROG_SFX="$( get_optval "$1" "$2" )" } +set_program_transform_name() { + PROG_SED="$( get_optval "$1" "$2" )" +} set_tool() { local var_name="${1%%=*}" var_name="${var_name#--with-}" @@ -339,6 +343,7 @@ Fine tuning of the installation directories: Program names: --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names System types: --build=BUILD configure for building on BUILD [guessed] (ignored) @@ -376,6 +381,9 @@ while [ $# -ne 0 ]; do --program-suffix=*|--program-suffix) set_program_suffix "$1" "$2" && shift || shift 2 ;; + --program-transform-name=*|--program-transform-name) + set_program_transform_name "$1" "$2" && shift || shift 2 + ;; --force) FORCE=1; shift;; --help|-h) do_help; exit 0;; # Skip, auto-stuff compatibility @@ -398,6 +406,7 @@ if [ "${LOCAL_set}" = "y" ]; then set_mandir "" "$( pwd )/docs" set_program_prefix "" "" set_program_suffix "" "" + set_program_transform_name "" "" fi #--------------------------------------------------------------------- @@ -666,6 +675,7 @@ kconfig_sed="s/@@KCONFIG@@/$( for k_name in ${kconfig_list}; do -e "s,@@MANDIR@@,${MANDIR},g" \ -e "s,@@PROG_PFX@@,${PROG_PFX},g" \ -e "s,@@PROG_SFX@@,${PROG_SFX},g" \ + -e "s,@@PROG_SED@@,${PROG_SED},g" \ -e "s,@@VERSION@@,${VERSION},g" \ -e "s,@@DATE@@,${DATE},g" \ -e "s,@@LOCAL@@,${LOCAL_set},g" \ @@ -685,6 +695,7 @@ crosstool-NG configured as follows: MANDIR='${MANDIR}' PROG_PFX='${PROG_PFX}' PROG_SFX='${PROG_SFX}' + PROG_SED='${PROG_SED}' Now run: make |