diff options
| -rw-r--r-- | libgphoto2_port/gphoto-m4/gp-gettext-setup.m4 | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/libgphoto2_port/gphoto-m4/gp-gettext-setup.m4 b/libgphoto2_port/gphoto-m4/gp-gettext-setup.m4 index 2626384c6..49b8c7af2 100644 --- a/libgphoto2_port/gphoto-m4/gp-gettext-setup.m4 +++ b/libgphoto2_port/gphoto-m4/gp-gettext-setup.m4 @@ -58,18 +58,21 @@ dnl Error: Inconsistent values for GETTEXT_PACKAGE_LIBGPHOTO2 and po/Makevar dnl if the consistency check has failed. dnl cat >>${GP_GETTEXT_SETUP_MK} <<EOF - @MAKEVARS_FILE="\$\$(test -f '$3/Makevars' || echo '\$(srcdir)/')$3/Makevars"; \ - MAKEVARS_DOMAIN="\$\$(\$(SED) -n 's/^DOMAIN \{0,\}= \{0,\}//p' "\$\$MAKEVARS_FILE")"; \ - MAKE_TIME_DOMAIN="\$($1)"; \ - echo " MAKEVARS_DOMAIN=\$\$MAKEVARS_DOMAIN"; \ - echo " $1=\$($1)"; \ - if test "x\$\$MAKEVARS_DOMAIN" = "x\$($1)"; then \ - echo "Good: Matching gettext domain values (\$($1))"; \ - elif test "x\$\$USE_NLS" = xyes; then \ - echo "Error: Mismatching gettext domain values (\$($1) vs \$\${MAKEVARS_DOMAIN})"; \ - exit 1; \ - else \ - echo "Warning: Mismatching gettext domain values (\$($1) vs \$\${MAKEVARS_DOMAIN})"; \ + @set -ex; \\ + MAKEVARS_FILE="\$\$(test -f '$3/Makevars' || echo '\$(srcdir)/')$3/Makevars"; \\ + MAKEVARS_DOMAIN="\$\$(\$(SED) -n 's/^DOMAIN \\{0,\\}= \\{0,\\}//p' "\$\$MAKEVARS_FILE")"; \\ + MAKE_TIME_DOMAIN="\$($1)"; \\ + echo " MAKEVARS_DOMAIN=\$\$MAKEVARS_DOMAIN"; \\ + echo " $1=\$($1)"; \\ + if test "x\$\$MAKEVARS_DOMAIN" = "x\$($1)"; then \\ + echo "Good: Matching gettext domain values (\$($1))"; \\ + true; \\ + elif test "x\$\$USE_NLS" = xyes; then \\ + echo "Error: Mismatching gettext domain values (\$($1) vs \$\${MAKEVARS_DOMAIN})"; \\ + false; \\ + else \\ + echo "Warning: Mismatching gettext domain values (\$($1) vs \$\${MAKEVARS_DOMAIN})"; \\ + true; \\ fi EOF dnl |