Add support for --program-prefix, --program-suffix

and --program-transform-name options.

3 files changed, 22 insertions, 9 deletions

diff --git a/Makefile.in b/Makefile.in
index d702c84efba..76072df1b33 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -202,8 +202,12 @@ INSTALL_STRIP =
 
 # ============================= Targets ==============================
 
+# Program name transformation.
+TRANSFORM = @program_transform_name@
+
 # What emacs should be called when installed.
-EMACS = emacs
+EMACS = `echo emacs | sed '$(TRANSFORM)'`
+EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`
 
 # Subdirectories to make recursively.  `lisp' is not included
 # because the compiled lisp files are part of the distribution
@@ -331,10 +335,10 @@ install-arch-dep: mkdir
             exec_prefix=${exec_prefix} bindir=${bindir} \
             libexecdir=${libexecdir} archlibdir=${archlibdir} \
             INSTALL_STRIP=${INSTALL_STRIP})
-        ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs ${bindir}/emacs-${version}
-        -chmod 1755  ${bindir}/emacs-${version}
+        ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs ${bindir}/${EMACSFULL}
+        -chmod 1755  ${bindir}/$(EMACSFULL)
         rm -f ${bindir}/$(EMACS)
-        -ln ${bindir}/emacs-${version} ${bindir}/$(EMACS)
+        -ln ${bindir}/$(EMACSFULL) ${bindir}/$(EMACS)
         -unset CDPATH; \
         for f in `cd lib-src && echo fns-*.el`; do \
           if test -r lib-src/$$f ; then \
diff --git a/configure.in b/configure.in
index 5f4156896c1..612297a7fcb 100644
--- a/configure.in
+++ b/configure.in
@@ -27,6 +27,10 @@ AC_PREREQ(2.50)dnl
 AC_INIT(src/lisp.h)
 AC_CONFIG_HEADER(src/config.h:src/config.in)
 
+dnl Support for --program-prefix, --program-suffix and
+dnl --program-transform-name options
+AC_ARG_PROGRAM
+
 lispdir='${datadir}/emacs/${version}/lisp'
 locallisppath='${datadir}/emacs/${version}/site-lisp:'\
 '${datadir}/emacs/site-lisp:${datadir}/emacs/${version}/leim'
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index a4b6b07fc41..592b2de8c03 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -31,6 +31,9 @@ YACC=@YACC@
 version=@version@
 configuration=@configuration@
 
+# Program name transformation.
+TRANSFORM = @program_transform_name@
+
 # ==================== Where To Install Things ====================
 
 # The default location for installation.  Everything is placed in
@@ -296,17 +299,19 @@ install: ${archlibdir}
         @echo
         @echo "Installing utilities for users to run."
         for file in ${INSTALLABLES} ; do \
-          $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \
-          chmod a+rx ${bindir}/$${file}; \
+          $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
+          chmod a+rx ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
         done
         for file in ${INSTALLABLE_SCRIPTS} ; do \
-          $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \
-          chmod a+rx ${bindir}/$${file}; \
+          $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`  ; \
+          chmod a+rx ${bindir}/`echo $${file} | sed '$(TRANSFORM)'`; \
         done
 
 uninstall:
         (cd ${bindir}; \
-         rm -f ${INSTALLABLES} ${INSTALLABLE_SCRIPTS})
+        for file in ${INSTALLABLES} ${INSTALLABLE_SCRIPTS}; do \
+          rm -f ${bindir}/`echo $${file} | sed '$(TRANSFORM)'` ; \
+        done)
         (cd ${archlibdir}; \
          rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})