From eee820646dd61ff8c18aba1d97afd798c96b7116 Mon Sep 17 00:00:00 2001 From: OBATA Akio Date: Sun, 13 Jan 2019 18:09:58 +0900 Subject: [PATCH] Prevent to use GNU sed extension feature It is GNU sed extension feature to use "\n" in insert string, so it should be replaced with portable way. This resolves bug 2986. Signed-off-by: OBATA Akio --- qtinterface/interface_qt3/tmoc.cmake | 5 ++++- qtinterface/interface_tqt3/tmoc.cmake | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qtinterface/interface_qt3/tmoc.cmake b/qtinterface/interface_qt3/tmoc.cmake index 087fbdb..5321484 100755 --- a/qtinterface/interface_qt3/tmoc.cmake +++ b/qtinterface/interface_qt3/tmoc.cmake @@ -12,7 +12,10 @@ if [ -f @BIN_INSTALL_DIR@/tqt-replace-stream ]; then out_file="$3" @BIN_INSTALL_DIR@/tqt-replace-stream "${input_file}" | \ @MOC_EXECUTABLE@ | \ - sed "/#include / i #undef QT_NO_COMPAT\n#include \"${input_file}\"" \ + sed "/#include / i\\ +#undef QT_NO_COMPAT\\ +#include \"${input_file}\"\\ +" \ > "${out_file}" fi else diff --git a/qtinterface/interface_tqt3/tmoc.cmake b/qtinterface/interface_tqt3/tmoc.cmake index 8b55ef5..dda16b4 100755 --- a/qtinterface/interface_tqt3/tmoc.cmake +++ b/qtinterface/interface_tqt3/tmoc.cmake @@ -12,7 +12,10 @@ if [ -f @BIN_INSTALL_DIR@/tqt-replace-stream ]; then out_file="$3" @BIN_INSTALL_DIR@/tqt-replace-stream "${input_file}" | \ @MOC_EXECUTABLE@ | \ - sed "/#include / i #undef TQT_NO_COMPAT\n#include \"${input_file}\"" \ + sed "/#include / i\\ +#undef TQT_NO_COMPAT\\ +#include \"${input_file}\"\\ +" \ > "${out_file}" fi else