diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-18 17:38:16 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-18 17:38:16 +0000 |
| commit | 5ae188e4797d222fd4760b34cc5706ab69f50d5b (patch) | |
| tree | d2b53fdd48b7c23064fd144dc8dee1e0fd820cfa | |
| parent | fec125516bd226becc5d4003087a08793342a07f (diff) | |
Merge directory installation commands.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26827 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -814,8 +814,7 @@ $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) 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 @@ $(foreach lang,$(MAN_LANG),$(eval $(MENCODER_MAN_RULE))) 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: |