summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-20 21:57:57 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-20 21:57:57 +0000
commit36a3d4ef74e1edb759b2601c3e68e0dc8e25d8d3 (patch)
treec8def446290ed8230641fdf87b9ab9ec0bfd464a /Makefile
parente34daff6886f07ab35efdc0730e4ae0686c3e2ca (diff)
downloadmpv-36a3d4ef74e1edb759b2601c3e68e0dc8e25d8d3.tar.bz2
mpv-36a3d4ef74e1edb759b2601c3e68e0dc8e25d8d3.tar.xz
Simplify install calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21977 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index e0382bf3c4..c628cd0f20 100644
--- a/Makefile
+++ b/Makefile
@@ -256,20 +256,18 @@ ifeq ($(VIDIX),yes)
-install -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
endif
$(INSTALL) -d $(BINDIR)
- $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \
- $(BINDIR)/mplayer$(EXESUF)
+ $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR)
$(INSTALL) -d $(MANDIR)/man1
for i in $(MAN_LANG); do \
if test "$$i" = en ; then \
- $(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1 ; \
+ $(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ ; \
else \
$(INSTALL) -d $(MANDIR)/$$i/man1 ; \
- $(INSTALL) -c -m 644 DOCS/man/$$i/mplayer.1 $(MANDIR)/$$i/man1/mplayer.1 ; \
+ $(INSTALL) -c -m 644 DOCS/man/$$i/mplayer.1 $(MANDIR)/$$i/man1/ ; \
fi ; \
done
ifeq ($(MENCODER),yes)
- $(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) \
- $(BINDIR)/mencoder$(EXESUF)
+ $(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) $(BINDIR)
for i in $(MAN_LANG); do \
if test "$$i" = en ; then \
cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
@@ -286,9 +284,9 @@ ifeq ($(GUI),yes)
@echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html"
@echo "*** for GUI, and extract to $(DATADIR)/skins/"
$(INSTALL) -d $(prefix)/share/pixmaps
- $(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/mplayer.xpm
+ $(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/
$(INSTALL) -d $(prefix)/share/applications
- $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/mplayer.desktop
+ $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
endif
$(INSTALL) -d $(CONFDIR)
if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi