# HG changeset patch # User diego # Date 1211132296 0 # Node ID 488f86cbc522b58a8877e3321acd07f2b821f903 # Parent cf60ce406b0b7ace6c7e38a6b2f4101edd0fbd14 Merge directory installation commands. diff -r cf60ce406b0b -r 488f86cbc522 Makefile --- 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: