(find-function-search-for-symbol): Look

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a32f31857a5588848617bf0ecae1894517c36007..a4b2448916bda492bdae37f1c8f87a7c7c7a6b5a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -108,6 +108,8 @@ bitmapdir=@bitmapdir@
 # 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
 # set by the configure script's `--srcdir' option.
+
+# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
 srcdir=@srcdir@
 
 # Tell make where to find source files; this is needed for the makefiles.
@@ -238,29 +240,29 @@ blessmail: ${SUBDIR_MAKEFILES} src FRC
        cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) \
          MAKE='${MAKE}' archlibdir='$(archlibdir)'
 
-Makefile: Makefile.in config.status
+Makefile: $(srcdir)/Makefile.in config.status
        ./config.status
 
-src/Makefile: src/Makefile.in config.status
+src/Makefile: $(srcdir)/src/Makefile.in config.status
        ./config.status
 
-src/config.stamp: src/config.in config.status
+src/config.stamp: $(srcdir)/src/config.in config.status
        ./config.status
        touch src/config.stamp
 
-lib-src/Makefile: lib-src/Makefile.in config.status
+lib-src/Makefile: $(srcdir)/lib-src/Makefile.in config.status
        ./config.status
 
-man/Makefile: man/Makefile.in config.status
+man/Makefile: $(srcdir)/man/Makefile.in config.status
        ./config.status
 
-oldXMenu/Makefile: oldXMenu/Makefile.in config.status
+oldXMenu/Makefile: $(srcdir)/oldXMenu/Makefile.in config.status
        ./config.status
 
-lwlib/Makefile: lwlib/Makefile.in config.status
+lwlib/Makefile: $(srcdir)/lwlib/Makefile.in config.status
        ./config.status
 
-leim/Makefile: leim/Makefile.in config.status
+leim/Makefile: $(srcdir)/leim/Makefile.in config.status
        ./config.status
 
 # ==================== Installation ====================
@@ -338,16 +340,22 @@ install-arch-indep: mkdir
        done
        -rm -f ${lispdir}/subdirs.el
        $(srcdir)/update-subdirs ${lispdir}
-       -rm -f ${datadir}/emacs/${version}/site-lisp/subdirs.el
-       (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
-        echo "    (normal-top-level-add-subdirs-to-load-path))") \
-         > ${datadir}/emacs/${version}/site-lisp/subdirs.el
+       if [ -f ${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \
+       then true; \
+       else \
+         (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
+          echo "    (normal-top-level-add-subdirs-to-load-path))") \
+           > ${datadir}/emacs/${version}/site-lisp/subdirs.el; \
+       fi
        chmod a+r ${datadir}/emacs/${version}/site-lisp/subdirs.el
-       -rm -f ${datadir}/emacs/site-lisp/subdirs.el
-       (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
-        echo "    (normal-top-level-add-subdirs-to-load-path))") \
-         > ${datadir}/emacs/site-lisp/subdirs.el
-       chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
+       -if [ -f ${datadir}/emacs/site-lisp/subdirs.el ]; \
+       then true; \
+       else \
+         (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
+          echo "    (normal-top-level-add-subdirs-to-load-path))") \
+           > ${datadir}/emacs/site-lisp/subdirs.el; \
+       fi
+       -chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
        if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
        then \
           echo "Copying etc/DOC-* to ${docdir} ..." ; \
@@ -378,10 +386,17 @@ install-arch-indep: mkdir
           for f in ccmode* cl* customize* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* reftex* sc* vip* widget*; do \
             (cd $${thisdir}; \
              ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
-             chmod a+r ${infodir}/$$f; \
-             ${INSTALL_INFO} --info-file=$$f); \
+             chmod a+r ${infodir}/$$f); \
           done); \
        else true; fi
+       -thisdir=`/bin/pwd`; \
+       if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+       then \
+         for f in ccmode cl customize dired-x ediff emacs forms gnus info message mh-e reftex sc vip widget; do \
+           (cd $${thisdir}; \
+            ${INSTALL_INFO} --dir-file=${infodir}/dir --info-file=${infodir}/$$f); \
+         done; \
+       else true; fi
        -chmod -R a+r ${COPYDESTS} ${infodir}
        thisdir=`/bin/pwd`; \
        cd ${srcdir}/etc; \