* buffer.c (list_buffers_1): Make desired_point a lisp object; set

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0dcc2fe..630df20 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -276,13 +276,13 @@ src/Makefile: ${srcdir}/src/Makefile.in Makefile
          echo "# Emacs build tree instead, or editing" ;               \
          echo "# \`${srcdir}/src/Makefile.in' itself." ;               \
          sed < ${srcdir}/src/Makefile.in                               \
-         -e 's|^\(srcdir *=\).*$$|\1'"${srcdir}"'/src|'                \
-         -e 's|^\(VPATH *=\).*$$|\1'"${srcdir}"'/src|'                 \
-         -e 's|^CC *=.*$$|CC='"${CC}"'|'                               \
-         -e 's|^CPP *=.*$$|CPP='"${CPP}"'|'                            \
-         -e 's|^LN_S *=.*$$|LN_S='"${LN_S}"'|'                         \
-         -e 's|^CFLAGS *=.*$$|CFLAGS='"${CFLAGS}"'|'                   \
-         -e 's|^\(LD_SWITCH_X_SITE *=\).*$$|\1'"${LD_SWITCH_X_SITE}"'|'        \
+         -e 's|^\(srcdir *=\).*$$|\1${srcdir}/src|'                    \
+         -e 's|^\(VPATH *=\).*$$|\1${srcdir}/src|'                     \
+         -e 's|^CC *=.*$$|CC=${CC}|'                                   \
+         -e 's|^CPP *=.*$$|CPP=${CPP}|'                                \
+         -e 's|^LN_S *=.*$$|LN_S=${LN_S}|'                             \
+         -e 's|^CFLAGS *=.*$$|CFLAGS=${CFLAGS}|'                       \
+         -e 's|^\(LD_SWITCH_X_SITE *=\).*$$|\1${LD_SWITCH_X_SITE}|'    \
          -e '/^# DIST: /d') > src/Makefile.tmp
        @${srcdir}/move-if-change src/Makefile.tmp src/Makefile
        chmod -w src/Makefile
@@ -388,22 +388,24 @@ mkdir: FRC.mkdir
 ### Delete all the installed files that the `install' target would
 ### create (but not the noninstalled files such as `make all' would
 ### create).
+###
+### Don't delete the lisp and etc directories if they're in the source tree.
 uninstall:
-       (cd lib-src; \
-        $(MAKE) ${MFLAGS} uninstall
-           prefix=${prefix} exec_prefix=${exec_prefix}
+       (cd lib-src;                                    \
+        $(MAKE) ${MFLAGS} uninstall                    \
+           prefix=${prefix} exec_prefix=${exec_prefix} \
            bindir=${bindir} libdir=${libdir} archlibdir=${archlibdir})
-       rm -f ${lispdir} ${etcdir}
-       case ${lispdir} in \
-         ${datadir}/emacs/${version}/* ) \
-           rm -rf ${datadir}/emacs/${version} \
-         ;; \
-       esac
-       case ${etcdir} in \
-         ${datadir}/emacs/${version}/* ) \
-           rm -rf ${datadir}/emacs/${version} \
-         ;; \
-       esac
+       for dir in ${lispdir} ${etcdir} ; do            \
+         case `(cd $${dir} ; pwd)` in                  \
+           `(cd ${srcdir} ; pwd)`* ) ;;                \
+           * ) rm -rf $${dir} ;;                       \
+         esac ;                                        \
+         case $${dir} in                               \
+           ${datadir}/emacs/${version}/* )             \
+             rm -rf ${datadir}/emacs/${version}        \
+           ;;                                          \
+         esac ;                                        \
+       done
        (cd ${infodir}; rm -f cl* emacs* forms* info* vip*)
        (cd ${mandir};  rm -f emacs.1 etags.1 ctags.1)
        (cd ${bindir};  rm -f emacs-${version} emacs)
@@ -450,7 +452,7 @@ clean: FRC.clean
 top_distclean=\
        rm -f config.status build-install ; \
        rm -f Makefile ${SUBDIR_MAKEFILES} ; \
-       (cd lock ; rm *)
+       (cd lock ; rm -f *)
 distclean: FRC.distclean
        (cd src;      make ${MFLAGS} distclean)
        (cd oldXMenu; make ${MFLAGS} distclean)