Mercurial > emacs
changeset 3010:4ca5a6bd174b
* configure.in: Add support for the `--exec-prefix' option.
* Makefile.in: Accept that support.
* configure.in: Use the AC_PROG_INSTALL macro.
* Makefile.in (INSTALL): Variable removed.
(INSTALL_PROGRAM, INSTALL_DATA): Accept these values from configure.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Mon, 24 May 1993 06:08:13 +0000 |
| parents | 1b3cab5f40e4 |
| children | 27557cd47d75 |
| files | Makefile.in configure1.in |
| diffstat | 2 files changed, 22 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Mon May 24 05:54:23 1993 +0000 +++ b/Makefile.in Mon May 24 06:08:13 1993 +0000 @@ -66,7 +66,7 @@ prefix=@prefix@ # Like `prefix', but used for architecture-specific files. -exec_prefix=${prefix} +exec_prefix=@exec_prefix@ # Where to install Emacs and other binaries that people will want to # run directly (like etags). @@ -183,9 +183,8 @@ # ==================== Utility Programs for the Build ==================== # Allow the user to specify the install program. -INSTALL = install -c -INSTALL_PROGRAM = ${INSTALL} -INSTALL_DATA = ${INSTALL} +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ # ============================= Targets ==============================
--- a/configure1.in Mon May 24 05:54:23 1993 +0000 +++ b/configure1.in Mon May 24 06:08:13 1993 +0000 @@ -103,6 +103,7 @@ ### Establish some default values. prefix='/usr/local' +exec_prefix='${prefix}' while [ $# != 0 ]; do arg="$1" @@ -240,6 +241,22 @@ prefix="${val}" ;; + ## Has the user specifiec an installation prefix? + "exec_prefix" ) + ## If the value was omitted, get it from the next argument. + if [ "${valomitted}" = "yes" ]; then + ## Get the next argument from the argument list, if there is one. + if [ $# = 1 ]; then + (echo "${progname}: You must give a value for the \`--${optname}' option, as in + \`--${optname}=FOO'." + echo "${short_usage}") >&2 + exit 1 + fi + shift; val="$1" + fi + exec_prefix="${val}" + ;; + ## Has the user asked for some help? "usage" | "help" ) echo "${short_usage}" | more @@ -835,6 +852,7 @@ dnl checks for programs AC_LN_S AC_PROG_CPP +AC_PROG_INSTALL dnl checks for UNIX variants that set `DEFS' @@ -1028,6 +1046,7 @@ AC_SUBST(C_SWITCH_X_SITE) AC_SUBST(CFLAGS) AC_SUBST(prefix) +AC_SUBST(exec_prefix) AC_DEFINE_UNQUOTED(config_machfile, "\"${machfile}\"") AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")