changeset 3093:84fdb06c337d

(install): Don't handle INSTALLABLE_SCRIPTS in first loop. Delete files from bindir before installing new ones. (ALL_CFLAGS): Use ${srcdir} to find .../src dir.
author Richard M. Stallman <rms@gnu.org>
date Tue, 25 May 1993 20:11:39 +0000
parents 12f77fc97b48
children 4b3770f84aa7
files lib-src/Makefile.in
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lib-src/Makefile.in	Tue May 25 20:05:02 1993 +0000
+++ b/lib-src/Makefile.in	Tue May 25 20:11:39 1993 +0000
@@ -42,10 +42,11 @@
 # data.  ${archlibdir} is usually below this.
 libdir=${exec_prefix}/lib
 
-# Where to find the source code.  The source code for Emacs's C kernel is
-# expected to be in ${srcdir}/src, and the source code for Emacs's
-# utility programs is expected to be in ${srcdir}/lib-src.  This is
+# Where to find the source code.  This is
 # set by the configure script's `--srcdir' option.
+# However, the value of ${srcdir} in this makefile
+# is not identical to what was specified with --srcdir.
+# The variable here has `/lib-src' added at the end.
 srcdir=@srcdir@/lib-src
 VPATH=@srcdir@/lib-src
 
@@ -102,7 +103,7 @@
 ### Some other files - those shared with other GNU utilities - need
 ### HAVE_CONFIG_H #defined before they know they can take advantage of
 ### the information in ../src/config.h.
-ALL_CFLAGS = ${C_SWITCH_SYSTEM} -Demacs -DHAVE_CONFIG_H -I../src ${CFLAGS}
+ALL_CFLAGS = ${C_SWITCH_SYSTEM} -Demacs -DHAVE_CONFIG_H -I${srcdir}/../src ${CFLAGS}
 .c.o:
 	${CC} -c ${CPPFLAGS} ${ALL_CFLAGS} $<
 
@@ -137,7 +138,7 @@
 install: ${archlibdir}
 	@echo
 	@echo "Installing utilities for users to run."
-	for file in ${INSTALLABLES} ${INSTALLABLE_SCRIPTS} ; do \
+	for file in ${INSTALLABLES} ; do \
 	  cp $${file} ${bindir}/$${file}.new ; \
 	  chmod 755 ${bindir}/$${file}.new ; \
         done
@@ -147,6 +148,7 @@
 	-for file in emacsclient etags ctags b2m ; do \
 	  chgrp bin ${bindir}/$${file}.new ; \
 	  chown bin ${bindir}/$${file}.new ; \
+	  rm -f ${bindir}/$${file} ; \
 	  mv ${bindir}/$${file}.new ${bindir}/$${file} ; \
         done