# HG changeset patch # User "Yann E. MORIN" # Date 1313961086 -7200 # Node ID e8e30025fcc5ffeff5baee891fcfd1b7dff99410 # Parent bc9f7c29311ebb58a3fc551df1f33628d518bc7e configure: recognise and handle --program-transform-name Signed-off-by: "Yann E. MORIN" diff -r bc9f7c29311e -r e8e30025fcc5 Makefile.in --- a/Makefile.in Fri Aug 19 22:43:01 2011 +0200 +++ b/Makefile.in Sun Aug 21 23:11:26 2011 +0200 @@ -45,6 +45,7 @@ MANDIR := @@MANDIR@@ PROG_PFX:=@@PROG_PFX@@ PROG_SFX:=@@PROG_SFX@@ +PROG_SED:=@@PROG_SED@@ DATE := @@DATE@@ LOCAL := @@LOCAL@@ @@ -68,7 +69,7 @@ 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 @@ -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 @@ 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 diff -r bc9f7c29311e -r e8e30025fcc5 configure --- a/configure Fri Aug 19 22:43:01 2011 +0200 +++ b/configure Sun Aug 21 23:11:26 2011 +0200 @@ -13,6 +13,7 @@ MANDIR_set= PROG_PFX= PROG_SFX= +PROG_SED= LOCAL_set= FORCE= @@ -68,6 +69,9 @@ 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 @@ 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 @@ --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 @@ set_mandir "" "$( pwd )/docs" set_program_prefix "" "" set_program_suffix "" "" + set_program_transform_name "" "" fi #--------------------------------------------------------------------- @@ -666,6 +675,7 @@ -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 @@ MANDIR='${MANDIR}' PROG_PFX='${PROG_PFX}' PROG_SFX='${PROG_SFX}' + PROG_SED='${PROG_SED}' Now run: make