* lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.html,

?!GENERIC?%DEST_PREFIX%.html): Use $(X), not ${X}.

diff --git a/ChangeLog b/ChangeLog
index 32798f620efab4497f32f5ba4ddc851eea3c7f56..08136627e2f36841f15d01dcf026376378053966 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-07-17  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.html,
+       ?!GENERIC?%DEST_PREFIX%.html): Use $(X), not ${X}.
+
        * tests/installdir.test: installdirs-local should appear three times,
        since the change from 2004-07-11 will make it PHONY.
 

diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index d71b2c45e606e3217b86efc191cf55e8ea6e033c..db9ba42d46671214f6d58076788e3520c4e653f4 100644 (file)
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -86,18 +86,18 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%
 ## in the manual change, it may leave unused pages.  Our fix
 ## is to build under a temporary name, and replace the target on
 ## success.
-       rm -rf ${@:.html=.htp}
+       rm -rf $(@:.html=.htp)
        if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% \
-?GENERIC?       -o ${@:.html=.htp} %SOURCE%; \
-?!GENERIC?      -o ${@:.html=.htp} `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
+?GENERIC?       -o $(@:.html=.htp) %SOURCE%; \
+?!GENERIC?      -o $(@:.html=.htp) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
        then \
          rm -rf $@; \
 ## Work around a bug in Texinfo 4.1 (-o foo.html outputs files in foo/
 ## instead of foo.html/).
-         if test ! -d ${@:.html=.htp} && test -d $(@:.html=); then \
+         if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
            mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
        else \
-         if test ! -d ${@:.html=.htp} && test -d $(@:.html=); then \
+         if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
            rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
          exit 1; \
        fi