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

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Fri Sep 18 20:48:42 UTC 2009


The following commit has been merged in the master branch:
commit ad7f47cb7f2fae7436c24b8056ffa11bdfd60d1f
Author: Martin Storsjo <martin at martin.st>
Date:   Tue May 19 16:18:28 2009 +0200

    Overwrite symlinks when installing

diff --git a/amrnb/Makefile b/amrnb/Makefile
index b54cf65..1a8f567 100644
--- a/amrnb/Makefile
+++ b/amrnb/Makefile
@@ -74,8 +74,8 @@ install: libopencore-amrnb.a $(SHLIB)
 	install -m 644 libopencore-amrnb.a $(DESTDIR)$(PREFIX)/lib
 	install $(SHLIB) $(DESTDIR)$(PREFIX)/lib
 ifneq ($(shell uname), Darwin)
-	ln -s $(SHLIB) $(DESTDIR)$(PREFIX)/lib/$(SONAME)
-	ln -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/libopencore-amrnb.so
+	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/lib/$(SONAME)
+	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/lib/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 8f632bf..baa4ca9 100644
--- a/amrwb/Makefile
+++ b/amrwb/Makefile
@@ -60,8 +60,8 @@ install: libopencore-amrwb.a $(SHLIB)
 	install -m 644 libopencore-amrwb.a $(DESTDIR)$(PREFIX)/lib
 	install $(SHLIB) $(DESTDIR)$(PREFIX)/lib
 ifneq ($(shell uname), Darwin)
-	ln -s $(SHLIB) $(DESTDIR)$(PREFIX)/lib/$(SONAME)
-	ln -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/libopencore-amrwb.so
+	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/lib/$(SONAME)
+	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/lib/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



More information about the pkg-multimedia-commits mailing list