From a986aade52ddfbab98d8d8df844c037233168b10 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 28 Nov 2006 10:04:41 +0000 Subject: [PATCH] Unrecurse VIDIX installation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21352 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 3 ++- vidix/drivers/Makefile | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 35834a3a6a..dd10f0e164 100644 --- a/Makefile +++ b/Makefile @@ -251,7 +251,8 @@ codecs2html$(EXESUF): mp_msg.o install: $(ALL_PRG) ifeq ($(VIDIX),yes) $(MAKE) -C libdha install - $(MAKE) -C vidix/drivers install + mkdir -p $(LIBDIR)/mplayer/vidix + -install -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix endif $(INSTALL) -d $(BINDIR) $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \ diff --git a/vidix/drivers/Makefile b/vidix/drivers/Makefile index 26f1129abc..9e41181862 100644 --- a/vidix/drivers/Makefile +++ b/vidix/drivers/Makefile @@ -67,10 +67,6 @@ distclean: clean dep depend: # do nothing here -install: - mkdir -p $(LIBDIR)/mplayer/vidix - -install -m 755 $(INSTALLSTRIP) -p *.so $(LIBDIR)/mplayer/vidix - ifneq ($(wildcard .depend),) include .depend endif