diff options
| author | Mark Wielaard <[email protected]> | 2014-08-26 11:14:06 +0200 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2014-08-26 11:14:06 +0200 |
| commit | e18bf66ce8070f96195880e83a50c9d98006b832 (patch) | |
| tree | bdcd37e1816ebf179c907a6c577eaf8420a677d7 | |
| parent | c56b49c8490f16c51825c17736f0fb4a119d6eee (diff) | |
| parent | f1ec744b5747a3bd66297c9f965be6ea10cb7f86 (diff) | |
Merge branch 'master' into portable
| -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 442550e6..2c065d17 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-08-25 Josh Stone <[email protected]> + + * Makefile.am: Prevent premature @AR@ replacement in a sed expression. + 2014-07-04 Menanteau Guy <[email protected]> Mark Wielaard <[email protected]> diff --git a/src/Makefile.am b/src/Makefile.am index 2787532f..835db6c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -165,7 +165,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 > [email protected] |