From 33ff3271b163284a0c30b0d54c75ddbadda11be3 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 17 Jul 2008 11:54:42 +0000 Subject: Evaluate man page installation rule for all available languages, but only install the requested languages. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27307 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6beffe562e..f3b75830bb 100644 --- a/Makefile +++ b/Makefile @@ -819,8 +819,8 @@ install-dirs: install-%: %$(EXESUF) install-dirs $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) -install-mplayer-man: $(foreach lang,$(MAN_LANG_ALL),install-mplayer-man-$(lang)) -install-mencoder-man: $(foreach lang,$(MAN_LANG_ALL),install-mencoder-man-$(lang)) +install-mplayer-man: $(foreach lang,$(MAN_LANG),install-mplayer-man-$(lang)) +install-mencoder-man: $(foreach lang,$(MAN_LANG),install-mencoder-man-$(lang)) install-mplayer-man-en: $(INSTALL) -d $(MANDIR)/man1 @@ -840,8 +840,8 @@ install-mencoder-man-$(lang): install-mplayer-man-$(lang) cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1 endef -$(foreach lang,$(MAN_LANG),$(eval $(MPLAYER_MAN_RULE))) -$(foreach lang,$(MAN_LANG),$(eval $(MENCODER_MAN_RULE))) +$(foreach lang,$(MAN_LANG_ALL),$(eval $(MPLAYER_MAN_RULE))) +$(foreach lang,$(MAN_LANG_ALL),$(eval $(MENCODER_MAN_RULE))) install-gui: install-mplayer -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) -- cgit v1.2.3 From adc68058bd8f88d6a9c59493468f734fdf3af895 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 17 Jul 2008 12:36:54 +0000 Subject: Rewrite translation handling in the build system. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27311 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f3b75830bb..94afe8de74 100644 --- a/Makefile +++ b/Makefile @@ -819,8 +819,8 @@ install-dirs: install-%: %$(EXESUF) install-dirs $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) -install-mplayer-man: $(foreach lang,$(MAN_LANG),install-mplayer-man-$(lang)) -install-mencoder-man: $(foreach lang,$(MAN_LANG),install-mencoder-man-$(lang)) +install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang)) +install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang)) install-mplayer-man-en: $(INSTALL) -d $(MANDIR)/man1 @@ -856,7 +856,7 @@ uninstall: rm -f $(prefix)/share/pixmaps/mplayer.xpm rm -f $(prefix)/share/applications/mplayer.desktop rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1 - rm -f $(foreach lang,$(MAN_LANG),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man))) + rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man))) clean: rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir)))) -- cgit v1.2.3 From 611c79b78206d929710d8bb2b704d3086d53e800 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 19 Jul 2008 11:32:33 +0000 Subject: Remove "en" from list of all man page languages when generating man page installation rules from a pattern. There is a separate rule for English above. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27330 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 94afe8de74..45dd590c47 100644 --- a/Makefile +++ b/Makefile @@ -840,8 +840,8 @@ install-mencoder-man-$(lang): install-mplayer-man-$(lang) cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1 endef -$(foreach lang,$(MAN_LANG_ALL),$(eval $(MPLAYER_MAN_RULE))) -$(foreach lang,$(MAN_LANG_ALL),$(eval $(MENCODER_MAN_RULE))) +$(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MPLAYER_MAN_RULE))) +$(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MENCODER_MAN_RULE))) install-gui: install-mplayer -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) -- cgit v1.2.3