[Emacs-diffs] /srv/bzr/emacs/trunk r108335: * Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529)

[Paul Eggert]

------------------------------------------------------------
revno: 108335
fixes bug(s): http://debbugs.gnu.org/11529
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2012-05-21 18:19:43 -0700
message:
  * Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name.  (Bug#11529)
  
  Without this further fix, aclocal was being invoked unnecessarily.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-22 01:10:05 +0000
+++ b/ChangeLog 2012-05-22 01:19:43 +0000
@@ -1,3 +1,8 @@
+2012-05-22  Paul Eggert  <address@hidden>
+
+       * Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name.  (Bug#11529)
+       Without this further fix, aclocal was being invoked unnecessarily.
+
 2012-05-22  Glenn Morris  <address@hidden>
 
        * Makefile.in (blessmail, install-arch-dep, uninstall):

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-22 01:10:05 +0000
+++ b/Makefile.in       2012-05-22 01:19:43 +0000
@@ -272,7 +272,7 @@
 # are treated separately.
 # quail appears twice because in out-of-tree builds, it exists twice.
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic 
${srcdir}/leim/quail leim/quail
-COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} 
$(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail 
$(DESTDIR)${leimdir}/quail 
+COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} 
$(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail 
$(DESTDIR)${leimdir}/quail
 
 all: ${SUBDIR}
 
@@ -365,7 +365,7 @@
 $(srcdir)/configure: $(AUTOCONF_INPUTS)
        cd ${srcdir} && autoconf
 
-ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/$(DOS_gnulib_comp.m4)
+ACLOCAL_INPUTS = @MAINT@ $(srcdir)/m4/gnulib-comp.m4
 $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
        cd $(srcdir) && aclocal -I m4