[Emacs-diffs] /srv/bzr/emacs/trunk r104343: Fix previous Makefile change.

[Glenn Morris]

------------------------------------------------------------
revno: 104343
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-24 00:06:44 -0700
message:
  Fix previous Makefile change.
  
  * configure.in (OPT_MAKEFILES_IN): Use full path.
  * Makefile.in (SUBDIR_MAKEFILES_IN): Use full path.
  (SUBDIR_MAKEFILES): Use relative path.
modified:
  Makefile.in
  configure.in

=== modified file 'Makefile.in'
--- a/Makefile.in       2011-05-24 04:00:56 +0000
+++ b/Makefile.in       2011-05-24 07:06:44 +0000
@@ -268,12 +268,19 @@
 OPT_MAKEFILES_IN = @OPT_MAKEFILES_IN@
 
 # The subdir makefiles created by config.status.
-SUBDIR_MAKEFILES_IN = lib/Makefile.in lib-src/Makefile.in \
-  doc/emacs/Makefile.in doc/misc/Makefile.in doc/lispref/Makefile.in \
-  doc/lispintro/Makefile.in src/Makefile.in oldXMenu/Makefile.in \
-  lwlib/Makefile.in leim/Makefile.in lisp/Makefile.in $(OPT_MAKEFILES_IN)
+SUBDIR_MAKEFILES_IN = $(srcdir)/lib/Makefile.in \
+  $(srcdir)/lib-src/Makefile.in \
+  $(srcdir)/doc/emacs/Makefile.in \
+  $(srcdir)/doc/misc/Makefile.in \
+  $(srcdir)/doc/lispref/Makefile.in \
+  $(srcdir)/doc/lispintro/Makefile.in \
+  $(srcdir)/src/Makefile.in \
+  $(srcdir)/oldXMenu/Makefile.in \
+  $(srcdir)/lwlib/Makefile.in \
+  $(srcdir)/leim/Makefile.in \
+  $(srcdir)/lisp/Makefile.in $(OPT_MAKEFILES_IN)
 
-SUBDIR_MAKEFILES = $(SUBDIR_MAKEFILES_IN:.in=)
+SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
 
 # Subdirectories to install, and where they'll go.
 # lib-src's makefile knows how to install it, so we don't do that here.

=== modified file 'configure.in'
--- a/configure.in      2011-05-24 04:00:56 +0000
+++ b/configure.in      2011-05-24 07:06:44 +0000
@@ -3719,7 +3719,7 @@
 
 dnl test/ is not present in release tarfiles.
 if test -f $srcdir/test/automated/Makefile.in; then
-  OPT_MAKEFILES_IN=test/automated/Makefile.in
+  OPT_MAKEFILES_IN="\$(srcdir)/test/automated/Makefile.in"
   AC_CONFIG_FILES([test/automated/Makefile])
 else
   OPT_MAKEFILES_IN=