diff options
| author | Josh Stone <jistone@redhat.com> | 2014-08-25 14:40:35 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2014-08-25 14:40:35 -0700 |
| commit | f1ec744b5747a3bd66297c9f965be6ea10cb7f86 (patch) | |
| tree | 1ce7462512c4fa863c01e56a70a08d7d4311f3b4 | |
| parent | 5efda26c21034f5c96680c7f78c8fe8936af11a7 (diff) | |
Prevent premature @AR@ replacement in a sed expression.elfutils-0.160
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>
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2d6965bf..986b3417 100644 --- 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 9829f15b..28dad858 100644 --- 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 |