Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/ChangeLog,v
retrieving revision 1.196
diff -u -r1.196 ChangeLog
--- ChangeLog	2001/11/12 08:50:11	1.196
+++ ChangeLog	2001/11/12 11:48:43
@@ -1,5 +1,10 @@
 2001-11-12  Pavel Janík  <address@hidden>
 
+	* configure.in, Makefile.in: Add support for --program-prefix,
+	--program-suffix and --program-transform-name options.
+
+2001-11-12  Pavel Janík  <address@hidden>
+
 	* Makefile.in (uninstall): Remove gfdl.1 when uninstalling.
 
 2001-11-10  Eli Zaretskii  <address@hidden>
Index: Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/Makefile.in,v
retrieving revision 1.240
diff -u -r1.240 Makefile.in
--- Makefile.in	2001/11/12 08:49:31	1.240
+++ Makefile.in	2001/11/12 11:48:43
@@ -202,8 +202,11 @@
 
 # ============================= Targets ==============================
 
+# Program name transformation.
+TRANSFORM = @program_transform_name@
+
 # What emacs should be called when installed.
-EMACS = emacs
+EMACS = `echo emacs | sed '$(TRANSFORM)'`
 
 # Subdirectories to make recursively.  `lisp' is not included
 # because the compiled lisp files are part of the distribution
@@ -331,10 +334,10 @@
 	    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}/$(EMACS)-${version}
+	-chmod 1755  ${bindir}/$(EMACS)-${version}
 	rm -f ${bindir}/$(EMACS)
-	-ln ${bindir}/emacs-${version} ${bindir}/$(EMACS)
+	-ln ${bindir}/$(EMACS)-${version} ${bindir}/$(EMACS)
 	-unset CDPATH; \
 	for f in `cd lib-src && echo fns-*.el`; do \
 	  if test -r lib-src/$$f ; then \
@@ -510,7 +513,7 @@
 	-rm -rf ${libexecdir}/emacs/${version}
 	(cd ${infodir} && rm -f cl* ada-mode* autotype* ccmode* ebrowse* efaq* elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
 	(cd ${man1dir}  && rm -f emacs.1 etags.1 ctags.1 gfdl.1)
-	(cd ${bindir}  && rm -f emacs-${version} $(EMACS))
+	(cd ${bindir}  && rm -f $(EMACS)-${version} $(EMACS))
 
 
 FRC:
Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.276
diff -u -r1.276 configure.in
--- configure.in	2001/11/10 15:18:36	1.276
+++ configure.in	2001/11/12 11:48:45
@@ -27,6 +27,10 @@
 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'
Index: etc/NEWS
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/NEWS,v
retrieving revision 1.511
diff -u -r1.511 NEWS
--- etc/NEWS	2001/11/11 17:58:05	1.511
+++ etc/NEWS	2001/11/12 11:48:51
@@ -9,6 +9,13 @@
 has already been updated.  --- means no change in the manuals
 is called for.
 
+* Installation Changes in Emacs 21.3
+
+** Emacs now supports new configure options `--program-prefix',
+`--program-suffix' and `--program-transform-name' that affect the names of
+installed programs.
+
+
 * Changes in Emacs 21.3
  
 +++
Index: lib-src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/ChangeLog,v
retrieving revision 2.118
diff -u -r2.118 ChangeLog
--- lib-src/ChangeLog	2001/11/03 19:04:48	2.118
+++ lib-src/ChangeLog	2001/11/12 11:48:55
@@ -1,3 +1,8 @@
+2001-11-12  Pavel Janík  <address@hidden>
+
+	* Makefile.in: Add support for --program-prefix, --program-suffix
+	and --program-transform-name options.
+
 2001-11-03  Richard M. Stallman  <address@hidden>
 
 	* cvtmail.c (xrealloc): Always pass two args to `fatal'.
Index: lib-src/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/Makefile.in,v
retrieving revision 1.121
diff -u -r1.121 Makefile.in
--- lib-src/Makefile.in	2001/10/24 22:54:38	1.121
+++ lib-src/Makefile.in	2001/11/12 11:48:55
@@ -31,6 +31,9 @@
 address@hidden@
 address@hidden@
 
+# Program name transformation.
+TRANSFORM = @program_transform_name@
+
 # ==================== Where To Install Things ====================
 
 # The default location for installation.  Everything is placed in
@@ -296,17 +299,19 @@
 	@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})