[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108262: Reduce some code duplication in Makefile.in

[Glenn Morris]

------------------------------------------------------------
revno: 108262
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-05-17 14:26:51 -0400
message:
  Reduce some code duplication in Makefile.in
  
  * Makefile.in (write_subdir): New.
  (install-arch-indep): Use $write_subdir.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-17 06:07:26 +0000
+++ b/ChangeLog 2012-05-17 18:26:51 +0000
@@ -1,5 +1,8 @@
 2012-05-17  Glenn Morris  <address@hidden>
 
+       * Makefile.in (write_subdir): New.
+       (install-arch-indep): Use $write_subdir.
+
        * configure.in (docdir, etcdir, infodir, lispdir):
        For a self-contained ns build, set these to the appropriate values.
        * Makefile.in (install-arch-dep): No need to move info/ any more.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-17 06:07:26 +0000
+++ b/Makefile.in       2012-05-17 18:26:51 +0000
@@ -514,6 +514,16 @@
 ## Note that the Makefiles in the etc directory are potentially useful
 ## in an installed Emacs, so should not be excluded.
 
+## Ensure that $subdir contains a subdirs.el file.
+write_subdir=if [ -f $${subdir}/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))") \
+           > $${subdir}/subdirs.el; \
+       fi; \
+       chmod a+r $${subdir}/subdirs.el
+
 install-arch-indep: mkdir info install-etc
        -set ${COPYDESTS} ; \
        unset CDPATH; \
@@ -553,22 +563,10 @@
        done
        -rm -f $(DESTDIR)${lispdir}/subdirs.el
        $(srcdir)/update-subdirs $(DESTDIR)${lispdir}
-       if [ -f $(DESTDIR)${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))") \
-           > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \
-       fi
-       chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el
-       -if [ -f $(DESTDIR)${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))") \
-           > $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el; \
-       fi
-       -chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el
+       subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \
+         ${write_subdir}
+       subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \
+         ${write_subdir} || true
        -unset CDPATH; \
        if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \
        then \