Mercurial > mplayer.hg

diff Makefile @ 26795:488f86cbc522

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge directory installation commands.
author diego
date Sun, 18 May 2008 17:38:16 +0000
parents cf60ce406b0b
children 4fb30593ab3d
line wrap: on
line diff
--- a/Makefile	Sun May 18 17:35:54 2008 +0000
+++ b/Makefile	Sun May 18 17:38:16 2008 +0000
@@ -814,8 +814,7 @@
 install: $(INSTALL_TARGETS-yes)
 
 install-dirs:
-	$(INSTALL) -d $(BINDIR)
-	$(INSTALL) -d $(CONFDIR)
+	$(INSTALL) -d $(BINDIR) $(CONFDIR)
 
 install-%: %$(EXESUF) install-dirs
 	$(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR)
@@ -846,10 +845,8 @@
 
 install-gui: install-mplayer
 	-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
-	$(INSTALL) -d $(DATADIR)/skins
-	$(INSTALL) -d $(prefix)/share/pixmaps
+	$(INSTALL) -d $(DATADIR)/skins $(prefix)/share/pixmaps $(prefix)/share/applications
 	$(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/
-	$(INSTALL) -d $(prefix)/share/applications
 	$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
 
 uninstall: