summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-14 10:57:18 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-14 10:57:18 +0000
commitcefc8f0ab2cf6d2dfeed2cd47dab74e2248d92a6 (patch)
tree1ac2a7f08bb29e469b6a58af3e35cb6b72696cb6
parent0ece25eb375fbe3e659f50cf857dc61e613049ec (diff)
downloaddrakx-cefc8f0ab2cf6d2dfeed2cd47dab74e2248d92a6.tar
drakx-cefc8f0ab2cf6d2dfeed2cd47dab74e2248d92a6.tar.gz
drakx-cefc8f0ab2cf6d2dfeed2cd47dab74e2248d92a6.tar.bz2
drakx-cefc8f0ab2cf6d2dfeed2cd47dab74e2248d92a6.tar.xz
drakx-cefc8f0ab2cf6d2dfeed2cd47dab74e2248d92a6.zip
(update_n_merge) split it out of (merge) ; now (merge) only update po w/o updating main pot file
-rw-r--r--perl-install/standalone/po/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/standalone/po/Makefile b/perl-install/standalone/po/Makefile
index b7b070cc7..b94e4408b 100644
--- a/perl-install/standalone/po/Makefile
+++ b/perl-install/standalone/po/Makefile
@@ -17,7 +17,9 @@ default: $(MOFILES)
%.mo: %.po
msgfmt -o $@ $<
-merge: $(NAME).pot
+update_n_merge: $(NAME).pot merge
+
+merge:
for n in $(POFILES); do \
echo "Merging $$n"; \
msgmerge $$n $(NAME).pot > "$$n"t ; \
OT=:ext:anoncvs@cvs.mandrakesoft.com:/cooker
+export CVSROOT=:ext:anoncvs@cvs.mandriva.com:/cooker
cvs checkout gi
(enter password 'cvs')
-This is only read-only access. If you want more, tell me (pixel@mandrakesoft.com)
+This is only read-only access. If you want more, tell me (pixel@mandriva.com)
Alas, all is not in CVS, a lot of things come from rpm packages which you must
install.
@@ -115,7 +115,7 @@ install/images/*.img
floppy boot images to use with DrakX. Use:
- cdrom.img for cdrom install
- network.img + network_drivers.img for ftp/nfs install (non-pcmcia devices)
- - hd_grub.img for hard-disk install (see http://qa.mandrakesoft.com/hd_grub.cgi)
+ - hd_grub.img for hard-disk install (see http://qa.mandriva.com/hd_grub.cgi)
- pcmcia.img for pcmcia install (see ``PCMCIA install'' below for more)
install/images/boot.iso