From ab414ba198cb4ad35506ae35886dfc0164f880f0 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Thu, 17 May 2012 06:17:26 -0400
Subject: [PATCH] Auto-commit of generated files.

---
 autogen/Makefile.in |  1 +
 autogen/configure   | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index ccf0b6ebd41..7029746b9bd 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -768,6 +768,7 @@ ns_appbindir = @ns_appbindir@
 ns_appdir = @ns_appdir@
 ns_appresdir = @ns_appresdir@
 ns_appsrc = @ns_appsrc@
+ns_self_contained = @ns_self_contained@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
diff --git a/autogen/configure b/autogen/configure
index e5f994a2540..1c699212665 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1163,6 +1163,7 @@ HAVE_XSERVER
 LIB_STANDARD
 NS_OBJC_OBJ
 NS_OBJ
+ns_self_contained
 LEIM_INSTALLDIR
 TEMACS_LDFLAGS2
 LD_SWITCH_X_SITE_RPATH
@@ -10109,6 +10110,7 @@ fi
 
 
 LEIM_INSTALLDIR="\${install_prefix}/leim"
+ns_self_contained=no
 ns_frag=/dev/null
 NS_OBJ=
 NS_OBJC_OBJ=
@@ -10121,9 +10123,15 @@ if test "${HAVE_NS}" = yes; then
   with_xft=no
   # set up packaging dirs
   if test "${EN_NS_SELF_CONTAINED}" = yes; then
+     ns_self_contained=yes
      prefix=${ns_appresdir}
      exec_prefix=${ns_appbindir}
-     libexecdir=${ns_appbindir}/libexec
+          libexecdir="\${ns_appbindir}/libexec"
+     archlibdir="\${ns_appbindir}/libexec"
+     docdir="\${ns_appresdir}/etc"
+     etcdir="\${ns_appresdir}/etc"
+               infodir="\${ns_appresdir}/info"
+     lispdir="\${ns_appresdir}/lisp"
      LEIM_INSTALLDIR="\${ns_appresdir}/leim"
   fi
   ns_frag=$srcdir/src/ns.mk
@@ -10138,6 +10146,7 @@ CPPFLAGS="$tmp_CPPFLAGS"
 
 
 
+
 case "${window_system}" in
   x11 )
     HAVE_X_WINDOWS=yes
-- 
2.39.2