summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Lirzin <mthl@gnu.org>2018-07-08 23:41:42 +0200
committerMathieu Lirzin <mthl@gnu.org>2018-07-08 23:57:10 +0200
commita348d830659fffd2cfc42994524783b07e69b4b5 (patch)
treee00973b2878d211e578dfa932b7e94d4691f00bc
parent596e9e130f38ae068ac6150b2d62eafd544900f6 (diff)
downloadautomake-a348d830659fffd2cfc42994524783b07e69b4b5.tar.gz
python: Don't use '\n' in sed substitution
This change fixes automake bug#31222. On macOS, 'sed' interprets '\n' in the substitution text as the letter 'n' instead of as a newline. * lib/am/python.am [?FIRST?] (am__pep3147_tweak): Use a space instead of '\n'. * NEWS: Update.
-rw-r--r--NEWS8
-rw-r--r--lib/am/python.am2
2 files changed, 9 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index a49787d68..8d6eb3aae 100644
--- a/NEWS
+++ b/NEWS
@@ -64,6 +64,14 @@
New in ?.?.?:
+* Bugs fixed
+
+ - When cleaning the compiled python files, '\n' is not used anymore in the
+ substitution text of 'sed' transformations. This is done to preserve
+ compatibility with the 'sed' implementation provided by macOS which
+ considers '\n' as the 'n' character instead of a newline.
+ (automake bug#31222)
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.16.1:
diff --git a/lib/am/python.am b/lib/am/python.am
index 21e6f842c..c855cddac 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -97,7 +97,7 @@ endif %?INSTALL%
if %?INSTALL%
?FIRST?am__pep3147_tweak = \
-?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|'
+?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc &.*.pyo|'
.PHONY uninstall-am: uninstall-%DIR%PYTHON
uninstall-%DIR%PYTHON: