- Makefile.in: Fix when COMPAT_PROGRAMS is empty.

7 files changed, 77 insertions, 30 deletions

diff --git a/Makefile.in b/Makefile.in
index 4f4d99d..ffbb86e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,7 +125,7 @@ all : scripts compat-programs $(if $(MSGFMT),$(LINGUAS:%=po/%.mo))
 
 .PHONY :: compat-programs
 compat-programs : $(COMPAT_PROGRAMS:%=compat/%)
-	chmod +x $+
+	$(if $+,chmod +x $+)
 
 $(LIB:%=lib/%) : $(LIB_SRC:%.c=lib/%.o)
 	$(CC) -o $@ $(LDFLAGS) $^ $(LIBS)
diff --git a/po/de.po b/po/de.po
index ca873d4..7487bbe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -82,7 +82,7 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n"
 
-#: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62
+#: quilt/add.in:78 quilt/annotate.in:106 quilt/applied.in:62
 #: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116
 #: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62
 #: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53
@@ -90,7 +90,7 @@ msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n"
 msgid "Patch %s is not in series\\n"
 msgstr "Patch %s ist nicht in der series-Datei enthalten\\n"
 
-#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121
+#: quilt/add.in:99 quilt/annotate.in:126 quilt/diff.in:239 quilt/graph.in:121
 #: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "Patch %s ist nicht angewandt\\n"
@@ -694,14 +694,16 @@ msgid "Failed to insert patch %s into file series\\n"
 msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n"
 
 #: quilt/mail.in:24
+#, fuzzy
 msgid ""
-"Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--"
-"bcc ...] [--subject ...]\\n"
+"Usage: quilt mail {--mbox file|--send} [--sender ...] [--from ...] [--"
+"to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 msgstr ""
 "Verwendung: quilt mail {--mbox datei|--send} [--from ...] [--to ...] [--"
 "cc ...] [--bcc ...] [--subject ...]\\n"
 
 #: quilt/mail.in:27
+#, fuzzy
 msgid ""
 "\n"
 "Create mail messages from all patches in the series file, and either store\n"
@@ -716,8 +718,13 @@ msgid ""
 "--send\n"
 "\tSend the messages directly.\n"
 "\n"
+"--sender\n"
+"\tThe envelope sender address to use. The address must be of the form\n"
+"\t\\`\\`user@domain.name''. No display name is allowed.\n"
+"\n"
 "--from, --subject\n"
-"\tThe values for the From and Subject headers to use.\n"
+"\tThe values for the From and Subject headers to use. If no --from\n"
+"\toption is given, the value of the --sender option is used.\n"
 "\n"
 "--to, --cc, --bcc\n"
 "\tAppend a recipient to the To, Cc, or Bcc header.\n"
@@ -742,6 +749,10 @@ msgstr ""
 "--to, --cc, --bcc\n"
 "\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n"
 
+#: quilt/mail.in:145
+msgid "Could not determine the envelope sender address. Please use --sender."
+msgstr ""
+
 #: quilt/new.in:22
 msgid "Usage: quilt new {patchname}\\n"
 msgstr "Verwendung: new {patchname}\\n"
diff --git a/po/fr.po b/po/fr.po
index c032690..f4185b5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -82,7 +82,7 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "Le fichier %s est situ� en dessous de %s\\n"
 
-#: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62
+#: quilt/add.in:78 quilt/annotate.in:106 quilt/applied.in:62
 #: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116
 #: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62
 #: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53
@@ -90,7 +90,7 @@ msgstr "Le fichier %s est situ� en dessous de %s\\n"
 msgid "Patch %s is not in series\\n"
 msgstr "Le patch %s n'est pas dans la s�rie\\n"
 
-#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121
+#: quilt/add.in:99 quilt/annotate.in:126 quilt/diff.in:239 quilt/graph.in:121
 #: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "Le patch %s n'est pas appliqu�\\n"
@@ -692,9 +692,10 @@ msgid "Failed to insert patch %s into file series\\n"
 msgstr "Impossible d'inserer %s dans le fichier de s�rie.\\n"
 
 #: quilt/mail.in:24
+#, fuzzy
 msgid ""
-"Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--"
-"bcc ...] [--subject ...]\\n"
+"Usage: quilt mail {--mbox file|--send} [--sender ...] [--from ...] [--"
+"to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 msgstr ""
 "Usage : quilt mail {--mbox fichier|--send} [--from ...] [--to ...] [--"
 "cc ...] [--bcc ...] [--subject ...]\\n"
@@ -715,8 +716,13 @@ msgid ""
 "--send\n"
 "\tSend the messages directly.\n"
 "\n"
+"--sender\n"
+"\tThe envelope sender address to use. The address must be of the form\n"
+"\t\\`\\`user@domain.name''. No display name is allowed.\n"
+"\n"
 "--from, --subject\n"
-"\tThe values for the From and Subject headers to use.\n"
+"\tThe values for the From and Subject headers to use. If no --from\n"
+"\toption is given, the value of the --sender option is used.\n"
 "\n"
 "--to, --cc, --bcc\n"
 "\tAppend a recipient to the To, Cc, or Bcc header.\n"
@@ -744,6 +750,10 @@ msgstr ""
 "\tAjoute un destinataire dans le champ d'en-t�te A, Copie ou Copie\n"
 "\tcach�e, respectivement.\n"
 
+#: quilt/mail.in:145
+msgid "Could not determine the envelope sender address. Please use --sender."
+msgstr ""
+
 #: quilt/new.in:22
 msgid "Usage: quilt new {patchname}\\n"
 msgstr "Usage : quilt new {nom_de_patch}\\n"
@@ -1447,9 +1457,6 @@ msgid "Renaming %s to %s: %s\n"
 msgstr "En renommant %s en %s : %s\n"
 
 #, fuzzy
-#~ msgid "Usage: quilt [-p patch] annotate {file}\\n"
-#~ msgstr "Usage : quilt annotate {fichier}\\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Create mail messages from all patches in the series file, and either "
@@ -1463,7 +1470,7 @@ msgstr "En renommant %s en %s : %s\n"
 #~ "\tcan later be sent using formail, for example.\n"
 #~ "\n"
 #~ "--send\n"
-#~ "\tSend the messages directly using %s.\n"
+#~ "\tSend the messages directly.\n"
 #~ "\n"
 #~ "--from, --subject\n"
 #~ "\tThe values for the From and Subject headers to use.\n"
@@ -1495,6 +1502,10 @@ msgstr "En renommant %s en %s : %s\n"
 #~ "\tAjoute un destinataire dans le champ d'en-t�te A, Copie ou Copie\n"
 #~ "\tcach�e, respectivement.\n"
 
+#, fuzzy
+#~ msgid "Usage: quilt [-p patch] annotate {file}\\n"
+#~ msgstr "Usage : quilt annotate {fichier}\\n"
+
 #~ msgid "Cannot change into directory %s\\n"
 #~ msgstr "Impossible d'entrer dans le r�pertoire %s\\n"
 
diff --git a/po/ja.po b/po/ja.po
index 6ca2672..5e5a2bd 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -80,7 +80,7 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "ファイル \\`%s'は、\\`%s'以下にあります\\n"
 
-#: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62
+#: quilt/add.in:78 quilt/annotate.in:106 quilt/applied.in:62
 #: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116
 #: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62
 #: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53
@@ -88,7 +88,7 @@ msgstr "ファイル \\`%s'は、\\`%s'以下にあります\\n"
 msgid "Patch %s is not in series\\n"
 msgstr "パッチ %s は seriesの中にありません\\n"
 
-#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121
+#: quilt/add.in:99 quilt/annotate.in:126 quilt/diff.in:239 quilt/graph.in:121
 #: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "パッチ %s は適用されていません\\n"
@@ -673,9 +673,10 @@ msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n"
 
 #: quilt/mail.in:24
+#, fuzzy
 msgid ""
-"Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--"
-"bcc ...] [--subject ...]\\n"
+"Usage: quilt mail {--mbox file|--send} [--sender ...] [--from ...] [--"
+"to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 msgstr ""
 "使い方: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] "
 "[--bcc ...] [--subject ...]\\n"
@@ -696,8 +697,13 @@ msgid ""
 "--send\n"
 "\tSend the messages directly.\n"
 "\n"
+"--sender\n"
+"\tThe envelope sender address to use. The address must be of the form\n"
+"\t\\`\\`user@domain.name''. No display name is allowed.\n"
+"\n"
 "--from, --subject\n"
-"\tThe values for the From and Subject headers to use.\n"
+"\tThe values for the From and Subject headers to use. If no --from\n"
+"\toption is given, the value of the --sender option is used.\n"
 "\n"
 "--to, --cc, --bcc\n"
 "\tAppend a recipient to the To, Cc, or Bcc header.\n"
@@ -721,6 +727,10 @@ msgstr ""
 "--to, --cc, --bcc\n"
 "\tToやCC、BCCへの受信者の追加。\n"
 
+#: quilt/mail.in:145
+msgid "Could not determine the envelope sender address. Please use --sender."
+msgstr ""
+
 #: quilt/new.in:22
 msgid "Usage: quilt new {patchname}\\n"
 msgstr "使い方: quilt new {パッチ名}\\n"
@@ -1408,9 +1418,6 @@ msgid "Renaming %s to %s: %s\n"
 msgstr "%s から %s へ名前を変更しました: %s\n"
 
 #, fuzzy
-#~ msgid "Usage: quilt [-p patch] annotate {file}\\n"
-#~ msgstr "使い方: quilt annotate {ファイル}\\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Create mail messages from all patches in the series file, and either "
@@ -1424,7 +1431,7 @@ msgstr "%s から %s へ名前を変更しました: %s\n"
 #~ "\tcan later be sent using formail, for example.\n"
 #~ "\n"
 #~ "--send\n"
-#~ "\tSend the messages directly using %s.\n"
+#~ "\tSend the messages directly.\n"
 #~ "\n"
 #~ "--from, --subject\n"
 #~ "\tThe values for the From and Subject headers to use.\n"
@@ -1450,3 +1457,7 @@ msgstr "%s から %s へ名前を変更しました: %s\n"
 #~ "\n"
 #~ "--to, --cc, --bcc\n"
 #~ "\tToやCC、BCCへの受信者の追加。\n"
+
+#, fuzzy
+#~ msgid "Usage: quilt [-p patch] annotate {file}\\n"
+#~ msgstr "使い方: quilt annotate {ファイル}\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index cdc0f7b..f9b6b5d 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -46,7 +46,7 @@ msgstr ""
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr ""
 
-#: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62
+#: quilt/add.in:78 quilt/annotate.in:106 quilt/applied.in:62
 #: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116
 #: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62
 #: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53
@@ -54,7 +54,7 @@ msgstr ""
 msgid "Patch %s is not in series\\n"
 msgstr ""
 
-#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121
+#: quilt/add.in:99 quilt/annotate.in:126 quilt/diff.in:239 quilt/graph.in:121
 #: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr ""
@@ -475,8 +475,8 @@ msgstr ""
 
 #: quilt/mail.in:24
 msgid ""
-"Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--"
-"bcc ...] [--subject ...]\\n"
+"Usage: quilt mail {--mbox file|--send} [--sender ...] [--from ...] [--"
+"to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 msgstr ""
 
 #: quilt/mail.in:27
@@ -494,13 +494,22 @@ msgid ""
 "--send\n"
 "\tSend the messages directly.\n"
 "\n"
+"--sender\n"
+"\tThe envelope sender address to use. The address must be of the form\n"
+"\t\\`\\`user@domain.name''. No display name is allowed.\n"
+"\n"
 "--from, --subject\n"
-"\tThe values for the From and Subject headers to use.\n"
+"\tThe values for the From and Subject headers to use. If no --from\n"
+"\toption is given, the value of the --sender option is used.\n"
 "\n"
 "--to, --cc, --bcc\n"
 "\tAppend a recipient to the To, Cc, or Bcc header.\n"
 msgstr ""
 
+#: quilt/mail.in:145
+msgid "Could not determine the envelope sender address. Please use --sender."
+msgstr ""
+
 #: quilt/new.in:22
 msgid "Usage: quilt new {patchname}\\n"
 msgstr ""
diff --git a/quilt.changes b/quilt.changes
index b3f1199..d2e8cd9 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Mon Sep 19 20:48:02 CEST 2005 - agruen@suse.de
+
+- Makefile.in: Fix when COMPAT_PROGRAMS is empty.
+
+-------------------------------------------------------------------
 Mon Sep 19 20:26:47 CEST 2005 - khali@linux-fr.org
 
 - Makefile.in: Fix harmless error message in reference rule.
diff --git a/test/annotate.test b/test/annotate.test
index 81cb85a..ae983e3 100644
--- a/test/annotate.test
+++ b/test/annotate.test
@@ -1,4 +1,4 @@
-	$ mkdir d
+	$ mkdir -p d/patches
 	$ cd d
 	
 	$ cat > foo