--- lib-src/Makefile.in.in.orig	Sun Oct 12 03:39:30 1997
+++ lib-src/Makefile.in.in	Wed Feb 25 01:34:51 1998
@@ -186,7 +186,7 @@
 
 ## Install the internal utilities.  Until they are installed, we can
 ## just run them directly from lib-src.
-${archlibdir}: all
+install-archlibdir: all
 	@echo; echo "Installing utilities run internally by XEmacs."
 	./make-path ${archlibdir}
 	if test `(cd ${archlibdir} && $(pwd))` != `$(pwd)`; then \
@@ -197,20 +197,30 @@
 	if test `(cd ${archlibdir} && $(pwd))` \
 	     != `(cd ${srcdir}     && $(pwd))`; then \
 	  for f in ${SCRIPTS}; do \
-	    (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \
+	    (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$$f ${archlibdir}/$$f); \
 	  done ; \
 	fi
 
 ## We do not need to install "wakeup" explicitly, because it will be
 ## copied when this whole directory is copied.
 .PHONY : all maybe-blessmail install uninstall
-install: ${archlibdir}
+install: install-archlibdir
 	@echo; echo "Installing utilities for users to run."
 	for file in ${INSTALLABLES} ; do \
-	  (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
+	  if [ $${file} = etags ] || [ $${file} = ctags ] || [ $${file} = b2m ] ; \
+	  then \
+	    (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/xemacs-$${file}) ; \
+	  else \
+	    (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
+	  fi \
 	done
 	for file in ${INSTALLABLE_SCRIPTS} ; do \
-	  (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \
+	  if [ $${file} = rcs-checkin ] || [ $${file} = send-pr ] ; \
+	  then \
+	    (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/xemacs-$${file}) ; \
+	  else \
+	    (cd .. && $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file}) ; \
+	  fi \
 	done
 
 uninstall: