(nnml-save-nov, nnml-generate-nov-file): Don't hardcode point-min == 1.

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 61e5f67ed17fcdb3dd844f53ed089e4013849c55..f40277410b877ed4924be5eec1dda813dc03693a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -227,7 +227,7 @@ SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile lispref/Makefile lispintro/Make
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
 
-all: maybe_bootstrap ${SUBDIR} leim
+all: ${SUBDIR} leim
 
 removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
 
@@ -262,7 +262,7 @@ lib-src: FRC src/config.stamp
 
 .RECURSIVE: ${SUBDIR} leim
 
-${SUBDIR}: ${SUBDIR_MAKEFILES} FRC
+${SUBDIR}: maybe_bootstrap ${SUBDIR_MAKEFILES} FRC
        cd $@; $(MAKE) all $(MFLAGS) \
          CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
          LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
@@ -377,6 +377,7 @@ install-arch-indep: mkdir info
              (cd $${dir}; tar -chf - . ) \
                | (cd $${dest}; umask 022; \
                    tar -xvf - && cat > /dev/null) || exit 1; \
+             find $${dest} -exec chown $$LOGNAME {} ';' ;\
              for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \
                chmod a+rx $${subdir} ; \
                rm -rf $${subdir}/RCS ; \
@@ -414,8 +415,8 @@ install-arch-indep: mkdir info
        then \
           echo "Copying etc/DOC-* to ${docdir} ..." ; \
           (cd ./etc; tar -chf - DOC*) \
-            |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \
-          (cd $(docdir); chmod a+r DOC*; rm DOC); \
+            |(cd ${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
+          (cd $(docdir); chown $${LOGNAME} DOC*; chmod a+r DOC*; rm DOC); \
        else true; fi
        -unset CDPATH; \
        if [ -r ./lisp ] \
@@ -425,7 +426,8 @@ install-arch-indep: mkdir info
        then \
           echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \
           (cd lisp; tar -chf - *.el *.elc) \
-            |(cd ${lispdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \
+            |(cd ${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
+          (cd ${lispdir}; find . -exec chown $${LOGNAME} {} ';') ; \
        else true; fi
        -unset CDPATH; \
        thisdir=`/bin/pwd`; \
@@ -439,7 +441,7 @@ install-arch-indep: mkdir info
              chmod a+r ${infodir}/dir); \
           fi; \
           cd ${srcdir}/info ; \
-          for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* elisp* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \
+          for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* eintr* elisp* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \
             (cd $${thisdir}; \
              ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
              chmod a+r ${infodir}/$$f); \
@@ -449,7 +451,7 @@ install-arch-indep: mkdir info
        thisdir=`/bin/pwd`; \
        if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
        then \
-         for f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman; do \
+         for f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp eintr emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman; do \
            (cd $${thisdir}; \
             ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
          done; \
@@ -515,7 +517,7 @@ uninstall:
        done
        (cd ${archlibdir} && rm -f fns-*)
        -rm -rf ${libexecdir}/emacs/${version}
-       (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
+       (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
        (cd ${man1dir}  && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext})
        (cd ${bindir}  && rm -f $(EMACSFULL) $(EMACS))
 
@@ -692,11 +694,13 @@ dvi:
 .PHONY: maybe_bootstrap
 
 maybe_bootstrap:
-       if [ ! -f $(srcdir)/lisp/abbrev.elc ]; then \
-         $(MAKE) $(MFLAGS) bootstrap; \
+       @if [ ! -f $(srcdir)/lisp/abbrev.elc ]; then \
+         echo "Essential Lisp files seem to be missing.  You should either"; \
+         echo "do \`make bootstrap' or create \`lisp/abbrev.elc' somehow.";    \
+         exit 1;\
        fi
 
-bootstrap: clean bootstrap-lisp-1 bootstrap-src bootstrap-lisp bootstrap-clean all info
+bootstrap: bootstrap-clean-before bootstrap-lisp-1 bootstrap-src bootstrap-lisp bootstrap-clean-after all info
 
 bootstrap-lisp-1:
        (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
@@ -707,5 +711,16 @@ bootstrap-lisp:
 bootstrap-src:
        (cd src; $(MAKE) $(MFLAGS) bootstrap)
 
-bootstrap-clean:
-       (cd src; $(MAKE) $(MFLAGS) clean)
+### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
+bootstrap-clean-before: FRC
+       (cd src;      $(MAKE) $(MFLAGS) mostlyclean)
+       (cd oldXMenu; $(MAKE) $(MFLAGS) clean)
+       (cd lwlib;    $(MAKE) $(MFLAGS) clean)
+       (cd lib-src;  $(MAKE) $(MFLAGS) clean)
+       -(cd man &&   $(MAKE) $(MFLAGS) clean)
+       -(cd lispref &&   $(MAKE) $(MFLAGS) clean)
+       -(cd lispintro &&   $(MAKE) $(MFLAGS) clean)
+       (cd leim;     $(MAKE) $(MFLAGS) clean)
+
+bootstrap-clean-after:
+       (cd src; $(MAKE) $(MFLAGS) mostlyclean)