aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortkikuchi <>2004-10-02 07:44:41 +0000
committertkikuchi <>2004-10-02 07:44:41 +0000
commit7449d8f61c76fa5920730f0155e6076956d55d7f (patch)
treeacec840a6fdb18c97dd45c66afc362e31b8b0978
parentcd2f1ba1b945512c887470cd8806c206a7038e0f (diff)
downloadmailman2-7449d8f61c76fa5920730f0155e6076956d55d7f.tar.gz
mailman2-7449d8f61c76fa5920730f0155e6076956d55d7f.tar.xz
mailman2-7449d8f61c76fa5920730f0155e6076956d55d7f.zip
Closing:
[ 799166 ] install-sh doesn't support multiple sources [ 946554 ] configure does not check for gettext/msgmerge
-rw-r--r--messages/Makefile.in5
-rw-r--r--misc/Makefile.in5
2 files changed, 7 insertions, 3 deletions
diff --git a/messages/Makefile.in b/messages/Makefile.in
index f02e0ee3..6f8937c3 100644
--- a/messages/Makefile.in
+++ b/messages/Makefile.in
@@ -107,7 +107,8 @@ doinstall: mofiles
po=$(srcdir)/$$d/LC_MESSAGES/mailman.po; \
mo=$(srcdir)/$$d/LC_MESSAGES/mailman.mo; \
dir=$(DESTDIR)$(prefix)/messages/$$d/LC_MESSAGES; \
- $(INSTALL) -m $(FILEMODE) $$po $$mo $$dir; \
+ $(INSTALL) -m $(FILEMODE) $$po $$dir; \
+ $(INSTALL) -m $(FILEMODE) $$mo $$dir; \
done
mofiles: $(MOFILES)
@@ -143,7 +144,7 @@ potfile: marked.files docstring.files
# .pot file
%/LC_MESSAGES/mailman.po: mailman.pot
@echo "Merging new template file with existing translations"
- $(MSGMERGE) -U $@ mailman.pot
+ $(MSGMERGE) -U $@ mailman.pot || touch $@
FORCE:
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 56ad8822..15d11bd5 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -77,7 +77,10 @@ all:
install: install-other install-packages
install-other:
- $(INSTALL) -m $(FILEMODE) $(ICONS) $(DESTDIR)$(ICONDIR)
+ for i in $(ICONS); \
+ do \
+ $(INSTALL) -m $(FILEMODE) $$i $(DESTDIR)$(ICONDIR); \
+ done
for d in $(PATHSDIRS); \
do \
dir=$(DESTDIR)$(prefix)/$$d; \