[SCM] clalsadrv packaging branch, master-experimental, updated. upstream/2.0.0-6-g364b118

quadrispro-guest at users.alioth.debian.org quadrispro-guest at users.alioth.debian.org
Fri Mar 19 00:28:54 UTC 2010


The following commit has been merged in the master-experimental branch:
commit fc537b4975a3597a6c85a7d953e4d1aa6dcb7f9e
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Fri Mar 19 01:27:47 2010 +0100

    Refresh debian/patches/01-makefile.patch.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index d015617..1281448 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -2,31 +2,28 @@ Author: Free Ekanayaka <freee at debian.org>
 Description: Set PREFIX properly, add DESTDIR var, create /usr/include
  before installing the headers.
 ---
- Makefile |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ libs/Makefile |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
---- clalsadrv.orig/Makefile
-+++ clalsadrv/Makefile
-@@ -14,11 +14,12 @@
- #  along with this program; if not, write to the Free Software
- #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
-+DESTDIR =
+--- clalsadrv.orig/libs/Makefile
++++ clalsadrv/libs/Makefile
+@@ -17,8 +17,8 @@
  
  # Modify as required.
  #
--PREFIX = /usr
+-PREFIX = /usr/local
 -SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
-+PREFIX = $(DESTDIR)/usr
++PREFIX = /usr
 +#SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
  LIBDIR = lib$(SUFFIX)
  
  
-@@ -47,6 +48,7 @@ $(CLALSADRV_MIN): $(CLALSADRV_O)
- 
+@@ -47,7 +47,7 @@ $(CLALSADRV_MIN): $(CLALSADRV_O)
  install:	$(CLALSADRV_MIN)
- 	/usr/bin/install -d $(PREFIX)/$(LIBDIR)
-+	/usr/bin/install -d $(PREFIX)/include
- 	/usr/bin/install -m 644 $(CLALSADRV_H) $(PREFIX)/include
- 	/usr/bin/install -m 755 $(CLALSADRV_MIN) $(PREFIX)/$(LIBDIR)
- 	/sbin/ldconfig -n $(PREFIX)/$(LIBDIR)
+ 	install -Dm 644 $(CLALSADRV_H)   $(DESTDIR)$(PREFIX)/include/$(CLALSADRV_H)
+ 	install -Dm 755 $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_MIN)
+-	/sbin/ldconfig $(PREFIX)/$(LIBDIR)
++	ln -sf $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_MAJ)
+ 	ln -sf $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_SO)
+ 
+ clean:

-- 
clalsadrv packaging



More information about the pkg-multimedia-commits mailing list