(shell-command-history): New variable.

[gnu-emacs] / lib-src / Makefile.in

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index c42b62520411916aa884eeb65bd764ed4a1ea573..2ea43a779899925d383b3ffeab0dd4b923148223 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -131,7 +131,7 @@ ${archlibdir}: all
            cp $${file} ${archlibdir} ; \
            chmod 755 ${archlibdir}/$${file} ; \
          done ; \
-        fi
+       fi
        @echo
        @echo "Changing the owner and group of Emacs's utility programs to \`bin'."
        @echo "(You may ignore errors here if you don't care about this.)"
@@ -142,35 +142,42 @@ ${archlibdir}: all
 
 # We don't need to install `wakeup' explicitly, because it will be copied when
 # this whole directory is copied.
+# We use .n, not .new as before, to avoid exceeding the 14-character limit.
 install: ${archlibdir}
        @echo
        @echo "Installing utilities for users to run."
        for file in ${INSTALLABLES} ; do \
-         cp $${file} ${bindir}/$${file}.new ; \
-         chmod 755 ${bindir}/$${file}.new ; \
-        done
+         cp $${file} ${bindir}/$${file}.n ; \
+         chmod 755 ${bindir}/$${file}.n ; \
+       done
        for file in ${INSTALLABLE_SCRIPTS} ; do \
-         cp ${srcdir}/$${file} ${bindir}/$${file}.new ; \
-         chmod 755 ${bindir}/$${file}.new ; \
-        done
+         cp ${srcdir}/$${file} ${bindir}/$${file}.n ; \
+         chmod 755 ${bindir}/$${file}.n ; \
+       done
        @echo
        @echo "Changing the owner and group of utility programs to \`bin'."
        @echo "(You may ignore errors here if you don't care about this.)"
        -for file in ${INSTALLABLES}  ${INSTALLABLE_SCRIPTS} ; do \
-         chgrp bin ${bindir}/$${file}.new ; \
-         chown bin ${bindir}/$${file}.new ; \
+         chgrp bin ${bindir}/$${file}.n ; \
+         chown bin ${bindir}/$${file}.n ; \
          rm -f ${bindir}/$${file} ; \
-         mv ${bindir}/$${file}.new ${bindir}/$${file} ; \
-        done
+         mv ${bindir}/$${file}.n ${bindir}/$${file} ; \
+       done
+
+uninstall:
+       (cd ${bindir}; \
+        rm -f ${INSTALLABLES} ${INSTALLABLE_SCRIPTS})
+       (cd ${archlibdir}; \
+        rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
 
 clean mostlyclean:
        -rm -f ${INSTALLABLES} ${UTILITIES} core *.o
 
-distclean:
-       -rm -f ${INSTALLABLES} ${UTILITIES} ../etc/DOC* core *.o
+distclean: clean
+       -rm -f ../etc/DOC* *.tab.c *.tab.h aixcc.c TAGS
 
 realclean: distclean
-       -rm TAGS aixcc.c
+       true
 
 extraclean: realclean
        -rm -f *~ \#*
@@ -199,14 +206,16 @@ test-distrib: ${srcdir}/test-distrib.c
 GETOPTOBJS = getopt.o getopt1.o $(ALLOCA)
 GETOPTDEPS = $(GETOPTOBJS) ${srcdir}/getopt.h
 getopt.o: ${srcdir}/getopt.c ${srcdir}/getopt.h
-        ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c
+       ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c
 getopt1.o: ${srcdir}/getopt1.c ${srcdir}/getopt.h
-        ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
+       ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
 
-etags: ${srcdir}/etags.c $(GETOPTDEPS)
+etags: ${srcdir}/etags.c $(GETOPTDEPS) ../src/config.h
        $(CC) ${CPP_CFLAGS} -DETAGS ${srcdir}/etags.c $(GETOPTOBJS) $(LOADLIBES) -o etags
 
-ctags: ${srcdir}/etags.c $(GETOPTDEPS)
+# We depend on etags to assure that parallel makes don't write two
+# etags.o files on top of each other.
+ctags: ${srcdir}/etags.c $(GETOPTDEPS) etags
        $(CC) ${CPP_CFLAGS} -DCTAGS ${srcdir}/etags.c $(GETOPTOBJS) $(LOADLIBES) -o ctags
 
 wakeup: ${srcdir}/wakeup.c