3 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e95a064218e..013734a8651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2012-05-17  Glenn Morris  <rgm@gnu.org>
 
-        * 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.
diff --git a/Makefile.in b/Makefile.in
index 53e73370b74..2f1a2345552 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -479,7 +479,6 @@ install-arch-dep: mkdir
                 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
 
diff --git a/configure.in b/configure.in
index 7cc41aa5897..0844cc2ecb6 100644
--- a/configure.in
+++ b/configure.in
@@ -1595,6 +1595,9 @@ if test "${HAVE_NS}" = yes; then
      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