[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108259: Minor optimization for install of self-contained NS info files

[Glenn Morris]

------------------------------------------------------------
revno: 108259
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-16 23:07:26 -0700
message:
  Minor optimization for install of self-contained NS info files
  
  * configure.in (etcdir): For a self-contained ns build,
  set it to the appropriate values.
  * Makefile.in (install-arch-dep): No need to move info/ any more.
modified:
  ChangeLog
  Makefile.in
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-17 05:55:29 +0000
+++ b/ChangeLog 2012-05-17 06:07:26 +0000
@@ -1,7 +1,8 @@
 2012-05-17  Glenn Morris  <address@hidden>
 
-       * configure.in (docdir, etcdir, lispdir):
+       * 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.
 
        * configure.in (ns_self_contained): New output variable.
        * Makefile.in (ns_self_contained): New, set by configure.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-17 05:32:37 +0000
+++ b/Makefile.in       2012-05-17 06:07:26 +0000
@@ -479,7 +479,6 @@
                rm -fr `basename "$$dir"`; mv "$$dir" . ; \
              done ; \
            fi ; \
-           if test -d share/info ; then rm -fr info; mv share/info . ; fi ; \
            rm -fr share ) ; \
        fi
 

=== modified file 'configure.in'
--- a/configure.in      2012-05-17 05:55:29 +0000
+++ b/configure.in      2012-05-17 06:07:26 +0000
@@ -1595,6 +1595,9 @@
      archlibdir="\${ns_appbindir}/libexec"
      docdir="\${ns_appresdir}/etc"
      etcdir="\${ns_appresdir}/etc"
+     dnl FIXME maybe set datarootdir instead.
+     dnl That would also get applications, icons, man.
+     infodir="\${ns_appresdir}/info"
      lispdir="\${ns_appresdir}/lisp"
      LEIM_INSTALLDIR="\${ns_appresdir}/leim"
   fi