(w32_menu_show): Set widget call_data to 0 if definition is nil.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 8d4a3eb..7b78f9c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -174,6 +174,7 @@ docdir=@docdir@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+INSTALL_INFO = install-info
 # By default, we uphold the dignity of our programs.
 INSTALL_STRIP =
 
@@ -337,13 +338,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 "(normal-top-level-add-subdirs-to-load-path)\n" \
-         > ${datadir}/emacs/${version}/site-lisp/subdirs.el
-       -rm -f ${datadir}/emacs/site-lisp/subdirs.el
-       echo "(normal-top-level-add-subdirs-to-load-path)\n" \
-         > ${datadir}/emacs/site-lisp/subdirs.el
-       -chmod -R a+r ${COPYDESTS}
+       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
+       -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} ..." ; \
@@ -364,19 +374,28 @@ install-arch-indep: mkdir
        if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
        then \
          (cd ${infodir};  \
-          if [ -f dir ]; then \
-            if [ ! -f dir.old ]; then mv -f dir dir.old; \
-            else mv -f dir dir.bak; fi; \
+          if [ -f dir ]; then true; \
+          else \
+            (cd $${thisdir}; \
+             ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir; \
+             chmod a+r ${infodir}/dir); \
           fi; \
           cd ${srcdir}/info ; \
-          (cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
-          (cd $${thisdir}; chmod a+r ${infodir}/dir); \
-          for f in ccmode* cl* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* sc* vip* widget*; do \
+          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); \
           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; \
        for page in emacs etags ctags ; do \
@@ -403,6 +422,8 @@ install-strip:
 mkdir: FRC
        $(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \
          ${bindir} ${datadir} ${docdir} ${libexecdir} \
+         ${datadir}/emacs/site-lisp \
+         ${datadir}/emacs/${version}/site-lisp \
          `echo ${locallisppath} | sed 's/:/ /g'`
 
 ### Delete all the installed files that the `install' target would
@@ -477,7 +498,7 @@ clean: FRC
 top_distclean=\
        rm -f config.status config.cache config.log ; \
        rm -f Makefile ${SUBDIR_MAKEFILES} ; \
-       (cd lock && (rm -f * || true))
+       if [ -d lock ] ; then (cd lock && (rm -f * || true)); else true; fi
 distclean: FRC
        (cd src;      $(MAKE) $(MFLAGS) distclean)
        (cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
@@ -570,6 +591,9 @@ dist:
 .PHONY: info dvi dist check
 force-info:
 info: force-info
-       (cd ${srcdir}/man; $(MAKE) $(MFLAGS) info)
+       # Note that man/Makefile knows how to
+       # put the info files in $(srcdir),
+       # so we can do ok running make in the build dir.
+       (cd man; $(MAKE) $(MFLAGS) info)
 dvi:
        (cd man; $(MAKE) $(MFLAGS) dvi)