Commit 86ddcc58 authored by Jim Blandy's avatar Jim Blandy
Browse files

* 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.
parent 261518d9
...@@ -66,7 +66,7 @@ libsrc_libs=@libsrc_libs@ ...@@ -66,7 +66,7 @@ libsrc_libs=@libsrc_libs@
prefix=@prefix@ prefix=@prefix@
# Like `prefix', but used for architecture-specific files. # 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 # Where to install Emacs and other binaries that people will want to
# run directly (like etags). # run directly (like etags).
...@@ -183,9 +183,8 @@ buildlisppath=${srcdir}/lisp ...@@ -183,9 +183,8 @@ buildlisppath=${srcdir}/lisp
# ==================== Utility Programs for the Build ==================== # ==================== Utility Programs for the Build ====================
# Allow the user to specify the install program. # Allow the user to specify the install program.
INSTALL = install -c INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = @INSTALL_DATA@
INSTALL_DATA = ${INSTALL}
# ============================= Targets ============================== # ============================= Targets ==============================
......
...@@ -103,6 +103,7 @@ inst_paths='' ...@@ -103,6 +103,7 @@ inst_paths=''
### Establish some default values. ### Establish some default values.
prefix='/usr/local' prefix='/usr/local'
exec_prefix='${prefix}'
while [ $# != 0 ]; do while [ $# != 0 ]; do
arg="$1" arg="$1"
...@@ -240,6 +241,22 @@ Set it to either \`yes' or \`no'." ...@@ -240,6 +241,22 @@ Set it to either \`yes' or \`no'."
prefix="${val}" 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? ## Has the user asked for some help?
"usage" | "help" ) "usage" | "help" )
echo "${short_usage}" | more echo "${short_usage}" | more
...@@ -835,6 +852,7 @@ fi ...@@ -835,6 +852,7 @@ fi
dnl checks for programs dnl checks for programs
AC_LN_S AC_LN_S
AC_PROG_CPP AC_PROG_CPP
AC_PROG_INSTALL
dnl checks for UNIX variants that set `DEFS' dnl checks for UNIX variants that set `DEFS'
...@@ -1028,6 +1046,7 @@ AC_SUBST(LD_SWITCH_X_SITE) ...@@ -1028,6 +1046,7 @@ AC_SUBST(LD_SWITCH_X_SITE)
AC_SUBST(C_SWITCH_X_SITE) AC_SUBST(C_SWITCH_X_SITE)
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_SUBST(prefix) AC_SUBST(prefix)
AC_SUBST(exec_prefix)
AC_DEFINE_UNQUOTED(config_machfile, "\"${machfile}\"") AC_DEFINE_UNQUOTED(config_machfile, "\"${machfile}\"")
AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"") AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment