[Debian-islamic-commits] [SCM] Packaging for libitl branch, master, updated. debian/0.7.0-3-6-g700d018

[أحمد المحمو =?UTF-8?Q?=D8=AF=D9=8A=20?=(Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 700d018bd082e1c47ff3846fae50e685408a558b
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Sat Jul 9 13:49:29 2011 +0200

    Added set_libdir.diff patch to get LIBDIR setting from configure script,
    and install libraries there.

diff --git a/debian/patches/series b/debian/patches/series
index 37dd67c..3b2d108 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 add_destdir.diff
+set_libdir.diff
 01_Makefile.in.diff
diff --git a/debian/patches/set_libdir.diff b/debian/patches/set_libdir.diff
new file mode 100644
index 0000000..dc7e3b7
--- /dev/null
+++ b/debian/patches/set_libdir.diff
@@ -0,0 +1,35 @@
+Description: Get LIBDIR setting from configure script, and install libraries 
+ there.
+Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -66,15 +66,15 @@
+         #strip --strip-unneeded build/$(FULLNAME)
+ 	rm -f build/*.o build/ITL_*
+ 	@echo "==> Installing libitl library..."
+-	test -d $(DESTDIR)$(PREFIX)/lib \
+-	|| mkdir -p $(DESTDIR)$(PREFIX)/lib \
++	test -d $(DESTDIR)$(LIBDIR) \
++	|| mkdir -p $(DESTDIR)$(LIBDIR) \
+ 	|| exit 1;
+-	cp build/$(FULLNAME) $(DESTDIR)$(PREFIX)/lib
+-	cp build/libitl.a $(DESTDIR)$(PREFIX)/lib
++	cp build/$(FULLNAME) $(DESTDIR)$(LIBDIR)
++	cp build/libitl.a $(DESTDIR)$(LIBDIR)
+         # Using cp -P as cp --no-dereference is not POSIX
+         # or use --preserve=link instead.
+-	cp -P build/$(SONAME) $(DESTDIR)$(PREFIX)/lib
+-	cp -P build/libitl.so $(DESTDIR)$(PREFIX)/lib
++	cp -P build/$(SONAME) $(DESTDIR)$(LIBDIR)
++	cp -P build/libitl.so $(DESTDIR)$(LIBDIR)
+ 	@echo "==> Installing ITL components..."
+ 	for i in $(COMPONENTS); do \
+ 	  $(MAKE) -C $$i install || exit 1; \
+--- a/build/config.mk.in
++++ b/build/config.mk.in
+@@ -13,3 +13,5 @@
+ PREFIX=@prefix@
+ VERSION=@PACKAGE_VERSION@
+ TARNAME=@PACKAGE_TARNAME@
++prefix=@prefix@
++LIBDIR=@libdir@

-- 
Packaging for libitl