X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=9613783be12ea98633b37845380a54dd648881e3;hb=5fb9be15e674d592f4b050861beac6520235b49d;hp=44e77056828ad1aea1278e680e1b9214e48ad25f;hpb=e063b1cc9b8106b27258eb68383fafbfa84e00c9;p=proxmox-i18n.git

diff --git a/Makefile b/Makefile
index 44e7705..9613783 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
-LINGUAS=de it fr ja es sv ru tr zh_CN da ca pl sl nb nn pt_BR eu fa gl hu
+LINGUAS=de it fr ja es sv ru tr zh_CN zh_TW da ca pl sl nb nn pt_BR eu fa gl hu
 
 VERSION=1.0
-PKGREL=2
+PKGREL=7
 
 PVE_I18N_DEB=pve-i18n_${VERSION}-${PKGREL}_all.deb
 PMG_I18N_DEB=pmg-i18n_${VERSION}-${PKGREL}_all.deb
 
-DEBS=${PMG_I18N_DEB} ${PVE_I18N_DEB}
+DEB1=${PMG_I18N_DEB}
+DEB2=$(PVE_I18N_DEB)
+DEBS=$(DEB1) $(DEB2)
 
 PMGLOCALEDIR=${DESTDIR}/usr/share/pmg-i18n
 PVELOCALEDIR=${DESTDIR}/usr/share/pve-i18n
@@ -14,24 +16,23 @@ PVELOCALEDIR=${DESTDIR}/usr/share/pve-i18n
 PMG_LANG_FILES=$(patsubst %, pmg-lang-%.js, $(LINGUAS))
 PVE_LANG_FILES=$(patsubst %, pve-lang-%.js, $(LINGUAS))
 
-all: | submodule
+all:
 
 .PHONY: deb
 deb: $(DEBS)
-$(DEBS): | submodule
+$(DEB2): $(DEB1)
+$(DEB1): | submodule
 	rm -rf dest
-	mkdir dest
-	rsync -a debian dest
-	make DESTDIR=dest install 
+	rsync -a * dest
 	cd dest; dpkg-buildpackage -b -us -uc
-	lintian $@
+	lintian $(DEBS)
 
 .PHONY: submodule
 submodule:
 	test -f "pmg-gui/Makefile" || git submodule update --init
 
 .PHONY: install
-install: ${PMG_LANG_FILES} ${PVE_LANG_FILES} 
+install: ${PMG_LANG_FILES} ${PVE_LANG_FILES}
 	install -d ${PMGLOCALEDIR}
 	install -m 0644 ${PMG_LANG_FILES} ${PMGLOCALEDIR}
 	install -d ${PVELOCALEDIR}
@@ -50,23 +51,22 @@ define potupdate
     ./jsgettext.pl -p "$(1) $(shell cd $(2);git rev-parse HEAD)" -o $(1).pot $(2)
 endef
 
-.PHONY: update
-update:
+.PHONY: update update_pot
+update_pot: submodule
 	git submodule foreach 'git pull --ff-only origin master'
 	$(call potupdate,proxmox-widget-toolkit,proxmox-widget-toolkit/)
 	$(call potupdate,pve-manager,pve-manager/www/manager6/)
 	$(call potupdate,proxmox-mailgateway,pmg-gui/js/)
-	msgcat proxmox-widget-toolkit.pot proxmox-mailgateway.pot pve-manager.pot > messages.pot.tmp
-	mv messages.pot.tmp messages.pot
+
+update: | update_pot messages.pot
 	for i in $(LINGUAS); do echo -n "$$i: "; msgmerge -s -v $$i.po messages.pot >$$i.po.tmp && mv $$i.po.tmp $$i.po; done;
-	rm messages.pot
 
-# try to generate po files when someone add a new language
-.SECONDARY: # do not delete generated intermediate file
-%.po: proxmox-widget-toolkit.pot proxmox-mailgateway.pot pve-manager.pot
-	msgcat $+ > $*.pot
-	msginit -i $*.pot -l $* -o $*.po
-	rm $*.pot
+init-%.po: messages.pot
+	msginit -i $^ -l $^ -o $*.po --no-translator
+
+.INTERMEDIATE: messages.pot
+messages.pot: proxmox-widget-toolkit.pot proxmox-mailgateway.pot pve-manager.pot
+	msgcat $^ > $@
 
 .PHONY: distclean
 distclean: clean
@@ -74,7 +74,7 @@ distclean: clean
 .PHONY: clean
 clean:
 	find . -name '*~' -exec rm {} ';'
-	rm -rf dest *.po.tmp *.js.tmp *.deb *.buildinfo *.changes pve-lang-*.js pmg-lang-*.js
+	rm -rf dest *.po.tmp *.js.tmp *.deb *.buildinfo *.changes *.js messages.pot
 
 .PHONY: upload-pve
 upload-pve: ${PVE_I18N_DEB}