From 0ef2659ddc203d0b6691a73ed2b5c1bd42b2d286 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 30 Jan 2007 11:02:19 +0000 Subject: [PATCH] cosmetics: Reorder install targets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22072 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f2fae3334a..b166db1082 100644 --- a/Makefile +++ b/Makefile @@ -257,10 +257,12 @@ INSTALL_TARGETS += $(INSTALL_TARGETS-yes) install: install-dirs $(INSTALL_TARGETS) -install-vidix: - $(MAKE) -C libdha install - mkdir -p $(LIBDIR)/mplayer/vidix - -install -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix +install-dirs: + $(INSTALL) -d $(BINDIR) + $(INSTALL) -d $(DATADIR) + $(INSTALL) -d $(MANDIR)/man1 + $(INSTALL) -d $(CONFDIR) + if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi install-mplayer: mplayer$(EXESUF) $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR) @@ -295,12 +297,10 @@ install-gui: $(INSTALL) -d $(prefix)/share/applications $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/ -install-dirs: - $(INSTALL) -d $(BINDIR) - $(INSTALL) -d $(DATADIR) - $(INSTALL) -d $(MANDIR)/man1 - $(INSTALL) -d $(CONFDIR) - if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi +install-vidix: + $(MAKE) -C libdha install + mkdir -p $(LIBDIR)/mplayer/vidix + -install -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix uninstall: -rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)