[Emacs-diffs] Changes to emacs/Makefile.in

[Eli Zaretskii]

Index: emacs/Makefile.in
diff -u emacs/Makefile.in:1.310 emacs/Makefile.in:1.311
--- emacs/Makefile.in:1.310     Sun Jan 29 13:08:58 2006
+++ emacs/Makefile.in   Fri Mar  3 10:36:21 2006
@@ -252,6 +252,14 @@
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
 
+# Info files.  This is here so that we can use it both in `install'
+# and in `uninstall'.  Don't add any *-1 etc. files here, only the main
+# files' names!
+INFO_FILES=ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp\
+ eintr emacs emacs-mime emacs-xtra eshell eudc flymake forms gnus idlwave\
+ info message mh-e newsticker org pcl-cvs pgg reftex sc ses sieve speedbar\
+ tramp vip viper widget woman smtpmail url rcirc erc
+
 all: ${SUBDIR} leim
 
 removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
@@ -497,17 +505,21 @@
              chmod a+r ${infodir}/dir); \
           fi; \
           cd ${srcdir}/info ; \
-          for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* 
ediff* efaq* eintr* elisp* emacs* emacs-mime* emacs-xtra* eshell* eudc* 
flymake* forms* gnus* idlwave* info* message* mh-e* newsticker* org* pcl-cvs* 
pgg* reftex* sc* ses* sieve* speedbar* tramp* vip* widget* woman* smtpmail* 
url* rcirc* erc*; do \
+          for f in ${INFO_FILES}; do \
             (cd $${thisdir}; \
-             ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
-             chmod a+r ${infodir}/$$f); \
+             for ff in $$f $$f-[1-9] $$f-[1-9][0-9] ; do \
+               if test -f ${srcdir}/info/$$ff; then \
+                 ${INSTALL_DATA} ${srcdir}/info/$$fi ${infodir}/$$ff; \
+                 chmod a+r ${infodir}/$$ff; \
+               else true ; fi; \
+             done); \
           done); \
        else true; fi
        -unset CDPATH; \
        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 eintr emacs emacs-mime emacs-xtra eshell eudc flymake forms gnus idlwave 
info message mh-e newsticker org pcl-cvs pgg reftex sc ses sieve speedbar tramp 
vip viper widget woman smtpmail url rcirc erc; do \
+         for f ${INFO_FILES}; do \
            (cd $${thisdir}; \
             ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \
          done; \
@@ -573,7 +585,10 @@
        done
        (cd ${archlibdir} && rm -f fns-*)
        -rm -rf ${libexecdir}/emacs/${version}
-       (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* 
efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* 
tramp* widget* woman* dired-x* ediff* emacs* emacs-xtra* flymake* forms* gnus* 
info* mh-e* newsticker* org* sc* ses* vip* smtpmail* url* rcirc* erc*)
+       for f in ${INFO_FILES} ; do \
+         (cd ${infodir} && rm -f $$f $$f-[1-9] $$f-[1-9][0-9]; \
+          ${INSTALL_INFO} --info-dir=${infodir} --remove=${infodir}/$$f); \
+       done
        (cd ${man1dir}  && rm -f emacs${manext} emacsclient${manext} 
etags${manext} ctags${manext})
        (cd ${bindir}  && rm -f $(EMACSFULL) $(EMACS))