Update copyright notice.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index fe10d61..afdef66 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -243,7 +243,7 @@ blessmail: ${SUBDIR_MAKEFILES} src FRC
 Makefile: $(srcdir)/Makefile.in config.status
        ./config.status
 
-config.status: configure
+config.status: ${srcdir}/configure
        ./config.status --recheck
 
 ${srcdir}/configure: configure.in aclocal.m4
@@ -321,7 +321,7 @@ install-arch-dep: mkdir
 ## as a workaround for a bug in tar on Ultrix 4.2.
 install-arch-indep: mkdir info
        -set ${COPYDESTS} ; \
-       -unset CDPATH; \
+       unset CDPATH; \
        for dir in ${COPYDIR} ; do \
          if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
            rm -rf $$1 ; \
@@ -331,14 +331,15 @@ install-arch-indep: mkdir info
        -set ${COPYDESTS} ; \
        mkdir ${COPYDESTS} ; \
        chmod ugo+rx ${COPYDESTS} ; \
-       -unset CDPATH; \
+       unset CDPATH; \
        for dir in ${COPYDIR} ; do \
          dest=$$1 ; shift ; \
          [ -d $${dir} ] \
          && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
          && (echo "Copying $${dir} to $${dest}..." ; \
              (cd $${dir}; tar -cf - . ) \
-               |(cd $${dest};umask 022; tar -xvf - && cat > /dev/null); \
+               | (cd $${dest}; umask 022; \
+                   tar -xvf - && cat > /dev/null) || exit 1; \
              for subdir in `find $${dest} -type d ! -name RCS ! -name CVS -print` ; do \
                chmod a+rx $${subdir} ; \
                rm -rf $${subdir}/RCS ; \
@@ -375,7 +376,7 @@ install-arch-indep: mkdir info
        then \
           echo "Copying etc/DOC-* to ${docdir} ..." ; \
           (cd ./etc; tar -cf - DOC*) \
-            |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null); \
+            |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \
           (cd $(docdir); chmod a+r DOC*; rm DOC); \
        else true; fi
        -unset CDPATH; \
@@ -386,7 +387,7 @@ install-arch-indep: mkdir info
        then \
           echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \
           (cd lisp; tar -cf - *.el *.elc) \
-            |(cd ${lispdir}; umask 0; tar -xvf - && cat > /dev/null); \
+            |(cd ${lispdir}; umask 0; tar -xvf - && cat > /dev/null) || exit 1; \
        else true; fi
        -unset CDPATH; \
        thisdir=`/bin/pwd`; \
@@ -400,7 +401,7 @@ install-arch-indep: mkdir info
              chmod a+r ${infodir}/dir); \
           fi; \
           cd ${srcdir}/info ; \
-          for f in ada-mode* autotype* ccmode* cl* dired-x* ediff* efaq* emacs* eudc* forms* gnus* idlwave* info* message* mh-e* reftex* sc* vip* widget*; do \
+          for f in ada-mode* autotype* ccmode* cl* dired-x* ebrowse* ediff* efaq* 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); \
@@ -410,9 +411,9 @@ 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 ccmode cl dired-x ediff efaq emacs eudc forms gnus idlwave info message mh-e reftex sc vip viper widget; do \
+         for f in ada-mode autotype ccmode cl dired-x ebrowse ediff efaq 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} --dir-file=${infodir}/dir --info-file=${infodir}/$$f); \
+            ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
          done; \
        else true; fi
        -chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir}
@@ -474,7 +475,9 @@ uninstall:
            esac ;                                      \
          fi ;                                          \
        done
-       (cd ${infodir} && rm -f cl* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*)
+       (cd ${archlibdir} && rm -f fns-*)
+       -rm -rf ${libexecdir}/emacs/${version}
+       (cd ${infodir} && rm -f cl* ada-mode* autotype* ccmode* ebrowse* efaq* 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.1 etags.1 ctags.1)
        (cd ${bindir}  && rm -f emacs-${version} $(EMACS))
 
@@ -531,6 +534,7 @@ distclean: FRC
        (cd lib-src;  $(MAKE) $(MFLAGS) distclean)
        (cd man &&    $(MAKE) $(MFLAGS) distclean)
        (cd leim;     $(MAKE) $(MFLAGS) distclean)
+       (cd lisp;     $(MAKE) $(MFLAGS) distclean)
        ${top_distclean}
 
 ### `maintainer-clean'
@@ -560,7 +564,7 @@ maintainer-clean: FRC
 extraclean:
        for i in ${SUBDIR}; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done
        ${top_distclean}
-       -rm config-tmp-*
+       -rm -f config-tmp-*
        -rm -f *~ \#*
 
 ### Unlocking and relocking.  The idea of these productions is to reduce
@@ -602,9 +606,9 @@ relock:
        (cd lwlib; chmod u+w *.[ch] Makefile README)
        (cd src; $(MAKE) $(MFLAGS) relock)
 
-TAGS tags:     lib-src src
-       # The src subdir knows how to do the right thing
-       # even when the build directory and source dir are different.
+# The src subdir knows how to do the right thing
+# even when the build directory and source dir are different.
+TAGS tags: lib-src src
        cd src; $(MAKE) tags
 
 check:
@@ -615,10 +619,10 @@ dist:
 
 .PHONY: info dvi dist check html
 force-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.
 info: force-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)