summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-07-21 15:03:49 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-07-21 15:03:49 +0300
commit2d4656e070697cebe8cb66568b3e8dd8919b5eed (patch)
tree39c927d18e0ab459c7ddf36dcb876d2d0621e2a6 /Makefile
parent92f0cba26b5c032f8b097f525862233d92a02a2d (diff)
parent4993d0c46afa109c3deb8d818be712ec86e0230a (diff)
downloadmpv-2d4656e070697cebe8cb66568b3e8dd8919b5eed.tar.bz2
mpv-2d4656e070697cebe8cb66568b3e8dd8919b5eed.tar.xz
Merge svn changes up to r27332
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 4a9976ea80..b377af3596 100644
--- a/Makefile
+++ b/Makefile
@@ -822,8 +822,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_LANGS),install-mplayer-man-$(lang))
+install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang))
install-mplayer-man-en:
$(INSTALL) -d $(MANDIR)/man1
@@ -843,8 +843,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,$(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)
@@ -859,7 +859,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))))