Commit 9658f740 authored by Arturo Borrero Gonzalez's avatar Arturo Borrero Gonzalez
Browse files

debian/: finish Multi-Arch support and migrate from /lib to /usr/lib

This commit does two interleaved things:

* finis Multi-Arch support by changing dirs names, missing in commit:
   637406a0

 ("iptables: make it Multi-Arch: foreign")

* move libs from /lib to /usr/lib/

Therefore, the final change is, for example:
 /lib -> /usr/lib/x86_64-linux-gnu

Files already under /usr/lib are simply moved to /usr/lib/<arch>
Signed-off-by: default avatarArturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
parent bf21537d
include/linux/netfilter_ipv4/ip_queue.h usr/include/linux/netfilter_ipv4/ include/linux/netfilter_ipv4/ip_queue.h usr/include/linux/netfilter_ipv4/
lib/lib*.so usr/lib/*/lib*.so
lib/pkgconfig usr/lib usr/lib/*/pkgconfig
usr/include usr/include
lib/xtables/libarpt_*.so usr/lib/*/xtables/libarpt_*.so
lib/xtables/libebt_*.so usr/lib/*/xtables/libebt_*.so
usr/sbin/*-compat* sbin usr/sbin/*-compat* sbin
usr/sbin/xtables-compat-multi sbin usr/sbin/xtables-compat-multi sbin
iptables/iptables-apply usr/sbin iptables/iptables-apply usr/sbin
iptables/iptables.xslt usr/share/iptables iptables/iptables.xslt usr/share/iptables
lib/libip*.so.* usr/lib/*/libip*.so.*
lib/xtables/libip*.so usr/lib/*/xtables/libip*.so
lib/xtables/libxt_*.so usr/lib/*/xtables/libxt_*.so
usr/sbin/ip6tables sbin usr/sbin/ip6tables sbin
usr/sbin/ip6tables-restore sbin usr/sbin/ip6tables-restore sbin
usr/sbin/ip6tables-save sbin usr/sbin/ip6tables-save sbin
......
lib/libxtables*.so.* usr/lib/*/libxtables*.so.*
...@@ -2,17 +2,21 @@ ...@@ -2,17 +2,21 @@
export V=1 export V=1
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
LIB_DIR := /usr/lib/$(DEB_HOST_MULTIARCH)
_dhopts := --with autoreconf _dhopts := --with autoreconf
_shlibdeps := \ _shlibdeps := \
-a -Xlib/xtables \ -a -X$(LIB_DIR) \
-l$(CURDIR)/debian/build/extensions/.libs -l$(CURDIR)/debian/build/extensions/.libs
_configure := \ _configure := \
--disable-libipq \ --disable-libipq \
--enable-devel \ --enable-devel \
--libdir=/lib \ --libdir=$(LIB_DIR) \
--with-xtlibdir=/lib/xtables --with-xtlibdir=$(LIB_DIR)/xtables
%: %:
dh $@ $(_dhopts) dh $@ $(_dhopts)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment