configure: recognise and handle --program-suffix
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Fri Aug 19 22:43:01 2011 +0200 (2011-08-19)
changeset 2622bc9f7c29311e
parent 2621 00853d565edf
child 2623 e8e30025fcc5
configure: recognise and handle --program-suffix

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
.hgignore
Makefile.in
configure
     1.1 --- a/.hgignore	Wed Aug 17 23:05:01 2011 +0200
     1.2 +++ b/.hgignore	Fri Aug 19 22:43:01 2011 +0200
     1.3 @@ -2,9 +2,9 @@
     1.4  
     1.5  # Generated files
     1.6  Makefile
     1.7 -*ct-ng
     1.8 -docs/*ct-ng.1
     1.9 -docs/*ct-ng.1.gz
    1.10 +*ct-ng*
    1.11 +docs/*ct-ng*.1
    1.12 +docs/*ct-ng*.1.gz
    1.13  paths.mk
    1.14  scripts/crosstool-NG.sh
    1.15  scripts/saveSample.sh
     2.1 --- a/Makefile.in	Wed Aug 17 23:05:01 2011 +0200
     2.2 +++ b/Makefile.in	Fri Aug 19 22:43:01 2011 +0200
     2.3 @@ -44,6 +44,7 @@
     2.4  DOCDIR := @@DOCDIR@@
     2.5  MANDIR := @@MANDIR@@
     2.6  PROG_PFX:=@@PROG_PFX@@
     2.7 +PROG_SFX:=@@PROG_SFX@@
     2.8  DATE   := @@DATE@@
     2.9  LOCAL  := @@LOCAL@@
    2.10  
    2.11 @@ -67,7 +68,7 @@
    2.12  MAN_SECTION := 1
    2.13  MAN_SUBDIR := /man$(MAN_SECTION)
    2.14  
    2.15 -PROG_NAME := $(PROG_PFX)ct-ng
    2.16 +PROG_NAME := $(PROG_PFX)ct-ng$(PROG_SFX)
    2.17  
    2.18  ###############################################################################
    2.19  # Sanity checks
    2.20 @@ -149,6 +150,7 @@
    2.21  	           -e 's,@@CT_DOCDIR@@,$(DOCDIR),g;'        \
    2.22  	           -e 's,@@CT_MANDIR@@,$(MANDIR),g;'        \
    2.23  	           -e 's,@@CT_PROG_PFX@@,$(PROG_PFX),g;'    \
    2.24 +	           -e 's,@@CT_PROG_SFX@@,$(PROG_SFX),g;'    \
    2.25  	           -e 's,@@CT_PROG_NAME@@,$(PROG_NAME),g;'  \
    2.26  	           -e 's,@@CT_VERSION@@,$(VERSION),g;'	    \
    2.27  	           -e 's,@@CT_DATE@@,$(DATE),g;'            \
    2.28 @@ -157,7 +159,10 @@
    2.29  	           $< >$@
    2.30  endef
    2.31  
    2.32 -$(PROG_PFX)%: %.in Makefile
    2.33 +docs/$(PROG_NAME).1: docs/ct-ng.1.in Makefile
    2.34 +	$(call sed_it)
    2.35 +
    2.36 +$(PROG_PFX)%$(PROG_SFX): %.in Makefile
    2.37  	$(call sed_it)
    2.38  
    2.39  %: %.in Makefile
     3.1 --- a/configure	Wed Aug 17 23:05:01 2011 +0200
     3.2 +++ b/configure	Fri Aug 19 22:43:01 2011 +0200
     3.3 @@ -12,6 +12,7 @@
     3.4  DOCDIR_set=
     3.5  MANDIR_set=
     3.6  PROG_PFX=
     3.7 +PROG_SFX=
     3.8  LOCAL_set=
     3.9  FORCE=
    3.10  
    3.11 @@ -64,6 +65,9 @@
    3.12  set_program_prefix() {
    3.13      PROG_PFX="$( get_optval "$1" "$2" )"
    3.14  }
    3.15 +set_program_suffix() {
    3.16 +    PROG_SFX="$( get_optval "$1" "$2" )"
    3.17 +}
    3.18  set_tool() {
    3.19      local var_name="${1%%=*}"
    3.20      var_name="${var_name#--with-}"
    3.21 @@ -334,6 +338,7 @@
    3.22  
    3.23  Program names:
    3.24    --program-prefix=PREFIX            prepend PREFIX to installed program names
    3.25 +  --program-suffix=SUFFIX            append SUFFIX to installed program names
    3.26  
    3.27  System types:
    3.28    --build=BUILD     configure for building on BUILD [guessed] (ignored)
    3.29 @@ -368,6 +373,9 @@
    3.30          --program-prefix=*|--program-prefix)
    3.31                      set_program_prefix "$1" "$2" && shift || shift 2
    3.32                      ;;
    3.33 +        --program-suffix=*|--program-suffix)
    3.34 +                    set_program_suffix "$1" "$2" && shift || shift 2
    3.35 +                    ;;
    3.36          --force)    FORCE=1; shift;;
    3.37          --help|-h)  do_help; exit 0;;
    3.38          # Skip, auto-stuff compatibility
    3.39 @@ -389,6 +397,7 @@
    3.40      set_docdir "" "$( pwd )/docs"
    3.41      set_mandir "" "$( pwd )/docs"
    3.42      set_program_prefix "" ""
    3.43 +    set_program_suffix "" ""
    3.44  fi
    3.45  
    3.46  #---------------------------------------------------------------------
    3.47 @@ -635,6 +644,9 @@
    3.48  case "${PROG_PFX}" in
    3.49      */*)    do_error "program prefix '${PROG_PFX}' contains a '/'";;
    3.50  esac
    3.51 +case "${PROG_SFX}" in
    3.52 +    */*)    do_error "program suffix '${PROG_SFX}' contains a '/'";;
    3.53 +esac
    3.54  
    3.55  #---------------------------------------------------------------------
    3.56  # That's all, folks!
    3.57 @@ -653,6 +665,7 @@
    3.58              -e "s,@@DOCDIR@@,${DOCDIR},g"       \
    3.59              -e "s,@@MANDIR@@,${MANDIR},g"       \
    3.60              -e "s,@@PROG_PFX@@,${PROG_PFX},g"   \
    3.61 +            -e "s,@@PROG_SFX@@,${PROG_SFX},g"   \
    3.62              -e "s,@@VERSION@@,${VERSION},g"     \
    3.63              -e "s,@@DATE@@,${DATE},g"           \
    3.64              -e "s,@@LOCAL@@,${LOCAL_set},g"     \
    3.65 @@ -671,6 +684,7 @@
    3.66    DOCDIR='${DOCDIR}'
    3.67    MANDIR='${MANDIR}'
    3.68    PROG_PFX='${PROG_PFX}'
    3.69 +  PROG_SFX='${PROG_SFX}'
    3.70  
    3.71  Now run:
    3.72    make