Prevent premature @AR@ replacement in a sed expression.

The Makefile rule for make-debug-archive has a sed expression to replace
@AR@ will the installed name, but this was itself getting replaced when
the Makefile was configured, for a pattern like "s,ar,/path/prefix-,g".
Havoc ensued in the resulting make-debug-archive.

The fix matches it using a regex bracket expression, "[@]AR[@]", so sed
will still match it, but it's immune to configure's replacement.

Signed-off-by: Josh Stone <jistone@redhat.com>

diff --git a/src/ChangeLog b/src/ChangeLog
index 2d6965bfff2714fdc765215863fab9351b541920..986b3417718089dc4e90eb7b51e8468dd129d409 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-25  Josh Stone  <jistone@redhat.com>
+
+       * Makefile.am: Prevent premature @AR@ replacement in a sed expression.
+
 2014-07-04  Menanteau Guy  <menantea@linux.vnet.ibm.com>
            Mark Wielaard  <mjw@redhat.com>
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 9829f15b97c2fd87cb50e9cd1a582f29e48ff910..28dad858102f600c32576c0d583b9dcf85b242fe 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -160,7 +160,7 @@ MAINTAINERCLEANFILES = ldlex.c ldscript.c ldscript.h
 make-debug-archive: $(srcdir)/make-debug-archive.in
        UNSTRIP=$(bindir)/`echo unstrip | sed '$(transform)'`; \
        AR=$(bindir)/`echo ar | sed '$(transform)'`; \
-       sed -e "s,@UNSTRIP@,$$UNSTRIP,g" -e "s,@AR@,$$AR,g" \
+       sed -e "s,[@]UNSTRIP[@],$$UNSTRIP,g" -e "s,[@]AR[@],$$AR,g" \
            -e "s%[@]PACKAGE_NAME[@]%$(PACKAGE_NAME)%g" \
            -e "s%[@]PACKAGE_VERSION[@]%$(PACKAGE_VERSION)%g" \
            $(srcdir)/make-debug-archive.in > $@.new