summaryrefslogtreecommitdiff
path: root/packages/mplayer/files/makefile-nostrip-svn.patch
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2007-03-16 16:54:31 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2007-03-16 16:54:31 +0000
commitd533fcda97f0fd7f8ed44619da3a7b87537b9ae8 (patch)
tree62351538698fc3464b05763637d37ed5da16d9e8 /packages/mplayer/files/makefile-nostrip-svn.patch
parent86c228e54834a26fa885386484a476079039e3e5 (diff)
parentfd25fcd294309185346b0f4c7a18b94b0b408d35 (diff)
merge of 'be6200db697731daae7d15a8ac5ca6b54f62a6d0'
and 'e68c7275015e0b7f4e92aa7483c3d7038567a3dc'
Diffstat (limited to 'packages/mplayer/files/makefile-nostrip-svn.patch')
-rw-r--r--packages/mplayer/files/makefile-nostrip-svn.patch43
1 files changed, 24 insertions, 19 deletions
diff --git a/packages/mplayer/files/makefile-nostrip-svn.patch b/packages/mplayer/files/makefile-nostrip-svn.patch
index 0c3180c728..44087e7dca 100644
--- a/packages/mplayer/files/makefile-nostrip-svn.patch
+++ b/packages/mplayer/files/makefile-nostrip-svn.patch
@@ -2,25 +2,30 @@ Index: trunk/Makefile
===================================================================
--- trunk.orig/Makefile
+++ trunk/Makefile
-@@ -253,10 +253,10 @@ install: $(ALL_PRG)
- ifeq ($(VIDIX),yes)
- $(MAKE) -C libdha install
- mkdir -p $(LIBDIR)/mplayer/vidix
-- -install -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
-+ -install -m 755 -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
- endif
- $(INSTALL) -d $(BINDIR)
-- $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) \
-+ $(INSTALL) -m 755 mplayer$(EXESUF) \
- $(BINDIR)/mplayer$(EXESUF)
- ifeq ($(GUI),yes)
- -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
-@@ -271,7 +271,7 @@ endif
- fi ; \
+@@ -264,7 +264,7 @@ install-dirs:
+ 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)
++ $(INSTALL) -m 755 mplayer$(EXESUF) $(BINDIR)
+
+ install-mplayer-man:
+ for i in $(MAN_LANG); do \
+@@ -277,7 +277,7 @@ install-mplayer-man:
done
- ifeq ($(MENCODER),yes)
-- $(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) \
-+ $(INSTALL) -m 755 mencoder$(EXESUF) \
- $(BINDIR)/mencoder$(EXESUF)
+
+ install-mencoder: mencoder$(EXESUF)
+- $(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) $(BINDIR)
++ $(INSTALL) -m 755 mencoder$(EXESUF) $(BINDIR)
for i in $(MAN_LANG); do \
if test "$$i" = en ; then \
+ cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
+@@ -299,7 +299,7 @@ install-gui:
+ install-vidix:
+ $(MAKE) -C libdha install
+ mkdir -p $(LIBDIR)/mplayer/vidix
+- $(INSTALL) -m 755 $(INSTALLSTRIP) -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
++ $(INSTALL) -m 755 -p vidix/drivers/*.so $(LIBDIR)/mplayer/vidix
+
+ uninstall:
+ -rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)