* Makerules ($(common-objpfx)%.h $(common-objpfx)%.h.d): Fix sed

	pattern for prepending $(..) so it doesn't affect $(foo).

diff --git a/ChangeLog b/ChangeLog
index 8823106..8cf0aef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-12-29  Roland McGrath  <roland@redhat.com>
 
+       * Makerules ($(common-objpfx)%.h $(common-objpfx)%.h.d): Fix sed
+       pattern for prepending $(..) so it doesn't affect $(foo).
+
        * math/Makefile (generated): Add $(addsuffix .c .S,$(calls:s_%=m_%)).
 
 2002-12-29  Jakub Jelinek  <jakub@redhat.com>

diff --git a/Makerules b/Makerules
index 6f5eacf..f4fed9f 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1186,7 +1186,7 @@ $(common-objpfx)%.h $(common-objpfx)%.h.d: $(..)scripts/gen-as-const.awk %.sym
                -MD -MF $(@:.h=.h.d)T -MT '$(@:.h=.h.d) $(@:.h.d=.h)' \
        | sed -n 's/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$$/#define \1 \2/p' > $(@:.h.d=.h)T
        sed $(sed-remove-objpfx) \
-           -e 's@  *\([^       \/][^   \]*\)@ $$(..)\1@g' \
+           -e 's@  *\([^       \/$$][^         \]*\)@ $$(..)\1@g' \
            -e 's@  *\.\.\/\([^         \]*\)@ $$(..)\1@g' \
            $(@:.h=.h.d)T > $(@:.h=.h.d)T2
        rm -f $(@:.h=.h.d)T