path: root/mcon/U/msgmerge_update.U
diff options
authorManoj Srivastava <>2014-04-27 18:05:39 -0700
committerManoj Srivastava <>2014-04-27 18:05:39 -0700
commit7d4c02d5c9108aa413fbb0ffa1dc8a39bc5f54a1 (patch)
tree2abb9ad01d397bc1e208f57f528c1ec529761392 /mcon/U/msgmerge_update.U
parent5c913c35c09a82eead2c07534baa709a5dead3e7 (diff)
parent8f5e5726134ce5b4bd436b16f367796d851df553 (diff)
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <> Conflicts: jmake/
Diffstat (limited to 'mcon/U/msgmerge_update.U')
1 files changed, 29 insertions, 0 deletions
diff --git a/mcon/U/msgmerge_update.U b/mcon/U/msgmerge_update.U
new file mode 100644
index 0000000..3005d16
--- /dev/null
+++ b/mcon/U/msgmerge_update.U
@@ -0,0 +1,29 @@
+?RCS: $Id: msgmerge_update.U 167 2013-05-08 17:58:00Z rmanfredi $
+?RCS: Copyright (c) 2006, Christian Biere
+?RCS: You may redistribute only under the terms of the Artistic License,
+?RCS: as specified in the README file that comes with the distribution.
+?RCS: You may reuse parts of this distribution only within the terms of
+?RCS: that same Artistic License; a copy of which may be found at the root
+?RCS: of the source tree for dist 4.0.
+?MAKE:msgmerge_update: msgmerge grep contains rm
+?MAKE: -pick add $@ %<
+?S: The command "msgmerge --update" if supported on your system, else ":".
+: check whether msgmerge supports --update
+echo " "
+echo "Let's see whether your $msgmerge supports the --update flag..." >&4
+$msgmerge --help | $grep -- --update >msghelp
+if $contains update msghelp >/dev/null 2>&1; then
+ echo "Good, it does."
+ msgmerge_update="$msgmerge --update"
+ echo "Sorry, it does not: we'll try to do without it."
+ msgmerge_update=":"
+$rm -f msghelp