Attached.
-- 
Daniel Schepler
diff -urN libedit-2.11-20080614.old//debian/libedit-dev.files libedit-2.11-20080614//debian/libedit-dev.files
--- libedit-2.11-20080614.old//debian/libedit-dev.files	2011-07-22 18:36:24.000000000 +0000
+++ libedit-2.11-20080614//debian/libedit-dev.files	2011-07-22 18:39:30.000000000 +0000
@@ -1,8 +1,8 @@
 usr/include/libedit/vis.h
 usr/include/editline/readline.h
 usr/include/histedit.h
-usr/lib/libedit.a
-usr/lib/libedit.so
+usr/lib/*/libedit.a
+usr/lib/*/libedit.so
 usr/share/man/man3/editline.3el
 usr/share/man/man5/editrc.5el
 usr/lib/pkgconfig/libedit.pc
diff -urN libedit-2.11-20080614.old//debian/libedit2.files libedit-2.11-20080614//debian/libedit2.files
--- libedit-2.11-20080614.old//debian/libedit2.files	2011-07-22 18:36:24.000000000 +0000
+++ libedit-2.11-20080614//debian/libedit2.files	2011-07-22 18:39:41.000000000 +0000
@@ -1,2 +1,2 @@
-usr/lib/libedit.so.2.11
-usr/lib/libedit.so.2
+usr/lib/*/libedit.so.2.11
+usr/lib/*/libedit.so.2
diff -urN libedit-2.11-20080614.old//debian/rules libedit-2.11-20080614//debian/rules
--- libedit-2.11-20080614.old//debian/rules	2011-07-22 18:36:24.000000000 +0000
+++ libedit-2.11-20080614//debian/rules	2011-07-22 18:43:27.000000000 +0000
@@ -9,7 +9,7 @@
 PKGDIR		 = ${CURDIR}/debian/tmp
 PMAKE_ARGS	 = MKPROFILE=no MKCATPAGES=no MLINKS= MANPAGES= \
 		 SHLIB_SHFLAGS="-Wl,-soname,libedit.so.${major}" \
-		 LDADD="*.so -lbsd -lcurses"
+		 LDADD="-lbsd -lcurses"
 EDITLINE_3_LINKS = el_init el_end el_reset el_gets el_getc el_push \
 		 el_parse el_set el_get el_source el_resize el_line \
 		 el_insertstr el_deletestr history_init history_end history
@@ -23,6 +23,7 @@
 
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH      ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 CROSS=CC=$(DEB_HOST_GNU_TYPE)-gcc LD=$(DEB_HOST_GNU_TYPE)-ld
@@ -53,6 +54,7 @@
 	dh_testroot
 	dh_clean
 	install -d ${PKGDIR}/usr/lib
+	install -d ${PKGDIR}/usr/lib/$(DEB_HOST_MULTIARCH)
 	install -d ${PKGDIR}/usr/include/readline
 	install -d ${PKGDIR}/usr/include/libedit
 	install -d ${PKGDIR}/usr/share/man/man3
@@ -66,8 +68,8 @@
 	cd libedit/readline && \
 	 pmake incinstall DESTDIR=${PKGDIR} ${PMAKE_ARGS}
 	mv ${PKGDIR}/usr/include/readline ${PKGDIR}/usr/include/editline
-	ln -sf libedit.so.${version} ${PKGDIR}/usr/lib/libedit.so.${major}
-	ln -sf libedit.so.${major} ${PKGDIR}/usr/lib/libedit.so
+	ln -sf libedit.so.${version} ${PKGDIR}/usr/lib/$(DEB_HOST_MULTIARCH)/libedit.so.${major}
+	ln -sf libedit.so.${major} ${PKGDIR}/usr/lib/$(DEB_HOST_MULTIARCH)/libedit.so
 
 binary-indep: build install
 binary-arch: build install
diff -urN libedit-2.11-20080614.old//libedit/Makefile libedit-2.11-20080614//libedit/Makefile
--- libedit-2.11-20080614.old//libedit/Makefile	2007-05-28 12:06:18.000000000 +0000
+++ libedit-2.11-20080614//libedit/Makefile	2011-07-22 18:46:03.000000000 +0000
@@ -4,6 +4,7 @@
 USE_SHLIBDIR=	yes
 
 WARNS=	3
+NOGCCERROR=1
 LIB=	edit
 
 LIBDPLIBS+=     termcap ${.CURDIR}/../libterm

Reply via email to