[SCM] opencore-amr packaging branch, master, updated. upstream/0.1.2-10-g7bf1e45

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 58e8780d3888e6013b22b3b59bae8a502f069d20
Author: Martin Storsjo <martin at martin.st>
Date:   Fri Jul 17 14:06:28 2009 +0300

    Make it possible to override the name of the lib directory
    with the LIBDIR env variable.
    
    Patch by Alexis Ballier (aballier at gentoo dot org)

diff --git a/amrnb/Makefile b/amrnb/Makefile
index c6a5fff..0bd94f1 100644
--- a/amrnb/Makefile
+++ b/amrnb/Makefile
@@ -2,6 +2,7 @@
 # a detached gsm_amr directory
 OC_BASE = ../opencore
 AMR_BASE = $(OC_BASE)/codecs_v2/audio/gsm_amr
+LIBDIR=lib
 
 # To compile as C instead of C++, define BUILD_AS_C
 ifneq (, $(BUILD_AS_C))
@@ -77,12 +78,12 @@ libopencore-amrnb.a: $(OBJS)
 	ar rcs $@ $+
 
 install: libopencore-amrnb.a $(SHLIB)
-	install -d $(DESTDIR)$(PREFIX)/lib
-	install -m 644 libopencore-amrnb.a $(DESTDIR)$(PREFIX)/lib
-	install $(SHLIB) $(DESTDIR)$(PREFIX)/lib
+	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
+	install -m 644 libopencore-amrnb.a $(DESTDIR)$(PREFIX)/$(LIBDIR)
+	install $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)
 ifneq ($(shell uname), Darwin)
-	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/lib/$(SONAME)
-	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/lib/libopencore-amrnb.so
+	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(SONAME)
+	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libopencore-amrnb.so
 endif
 	install -d $(DESTDIR)$(PREFIX)/include/opencore-amrnb
 	install -m 644 interf_dec.h $(DESTDIR)$(PREFIX)/include/opencore-amrnb
diff --git a/amrwb/Makefile b/amrwb/Makefile
index 38af1ce..da543c5 100644
--- a/amrwb/Makefile
+++ b/amrwb/Makefile
@@ -2,6 +2,7 @@
 # a detached gsm_amr directory
 OC_BASE = ../opencore
 AMR_BASE = $(OC_BASE)/codecs_v2/audio/gsm_amr
+LIBDIR=lib
 
 # To compile as C instead of C++, define BUILD_AS_C
 ifneq (, $(BUILD_AS_C))
@@ -57,12 +58,12 @@ libopencore-amrwb.a: $(OBJS)
 	ar rcs $@ $+
 
 install: libopencore-amrwb.a $(SHLIB)
-	install -d $(DESTDIR)$(PREFIX)/lib
-	install -m 644 libopencore-amrwb.a $(DESTDIR)$(PREFIX)/lib
-	install $(SHLIB) $(DESTDIR)$(PREFIX)/lib
+	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
+	install -m 644 libopencore-amrwb.a $(DESTDIR)$(PREFIX)/$(LIBDIR)
+	install $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)
 ifneq ($(shell uname), Darwin)
-	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/lib/$(SONAME)
-	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/lib/libopencore-amrwb.so
+	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(SONAME)
+	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libopencore-amrwb.so
 endif
 	install -d $(DESTDIR)$(PREFIX)/include/opencore-amrwb
 	install -m 644 dec_if.h $(DESTDIR)$(PREFIX)/include/opencore-amrwb

-- 
opencore-amr packaging