# HG changeset patch # User diego # Date 1170154939 0 # Node ID 9be62c47daa5ceda59550f85e9dfe2615651bcfa # Parent d0b456c672a95a213d5db3b5258020905a9e2a4f cosmetics: Reorder install targets. diff -r d0b456c672a9 -r 9be62c47daa5 Makefile --- a/Makefile Tue Jan 30 11:01:10 2007 +0000 +++ b/Makefile Tue Jan 30 11:02:19 2007 +0000 @@ -257,10 +257,12 @@ 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) -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)