From d39c3435b01da51d3d5e58d6d8d2cbd7cb2cdc51 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 6 Nov 2012 22:42:53 +0100 Subject: [PATCH] iptables: Install pkg-config files to right directory. --- config/rootfiles/common/iptables | 27 +++++---------------------- lfs/iptables | 3 ++- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables index 27c67df4aa..af034e8e0e 100644 --- a/config/rootfiles/common/iptables +++ b/config/rootfiles/common/iptables @@ -18,12 +18,6 @@ lib/libiptc.so.0.0.0 lib/libxtables.so lib/libxtables.so.7 lib/libxtables.so.7.0.0 -#lib/pkgconfig -#lib/pkgconfig/libip4tc.pc -#lib/pkgconfig/libip6tc.pc -#lib/pkgconfig/libipq.pc -#lib/pkgconfig/libiptc.pc -#lib/pkgconfig/xtables.pc lib/xtables #lib/xtables/libip6t_HL.so #lib/xtables/libip6t_LOG.so @@ -155,14 +149,9 @@ sbin/xtables-multi #usr/include/libnfnetlink/linux_nfnetlink.h #usr/include/libnfnetlink/linux_nfnetlink_compat.h #usr/include/linux/netfilter/Kbuild -#usr/include/linux/netfilter/ipset #usr/include/linux/netfilter/ipset/Kbuild -#usr/include/linux/netfilter/ipset/ip_set.h #usr/include/linux/netfilter/ipset/ip_set_ahash.h -#usr/include/linux/netfilter/ipset/ip_set_bitmap.h #usr/include/linux/netfilter/ipset/ip_set_getport.h -#usr/include/linux/netfilter/ipset/ip_set_hash.h -#usr/include/linux/netfilter/ipset/ip_set_list.h #usr/include/linux/netfilter/ipset/ip_set_timeout.h #usr/include/linux/netfilter/ipset/pfxlen.h #usr/include/linux/netfilter/nf_conntrack_amanda.h @@ -177,19 +166,8 @@ sbin/xtables-multi #usr/include/linux/netfilter/nf_conntrack_sip.h #usr/include/linux/netfilter/nf_conntrack_snmp.h #usr/include/linux/netfilter/nf_conntrack_tftp.h -#usr/include/linux/netfilter/xt_AUDIT.h -#usr/include/linux/netfilter/xt_CHECKSUM.h -#usr/include/linux/netfilter/xt_CT.h -#usr/include/linux/netfilter/xt_IDLETIMER.h #usr/include/linux/netfilter/xt_IMQ.h -#usr/include/linux/netfilter/xt_TEE.h -#usr/include/linux/netfilter/xt_addrtype.h -#usr/include/linux/netfilter/xt_cpu.h -#usr/include/linux/netfilter/xt_devgroup.h -#usr/include/linux/netfilter/xt_ipvs.h #usr/include/linux/netfilter/xt_layer7.h -#usr/include/linux/netfilter/xt_set.h -#usr/include/linux/netfilter/xt_socket.h #usr/include/net/netfilter #usr/include/net/netfilter/nf_conntrack_tuple.h #usr/include/net/netfilter/nf_nat.h @@ -209,8 +187,13 @@ usr/lib/libnetfilter_queue_libipq.so.1.0.0 usr/lib/libnfnetlink.so usr/lib/libnfnetlink.so.0 usr/lib/libnfnetlink.so.0.2.0 +#usr/lib/pkgconfig/libip4tc.pc +#usr/lib/pkgconfig/libip6tc.pc +#usr/lib/pkgconfig/libipq.pc +#usr/lib/pkgconfig/libiptc.pc #usr/lib/pkgconfig/libnetfilter_queue.pc #usr/lib/pkgconfig/libnfnetlink.pc +#usr/lib/pkgconfig/xtables.pc #usr/share/man/man1/iptables-xml.1 #usr/share/man/man3/ipq_create_handle.3 #usr/share/man/man3/ipq_destroy_handle.3 diff --git a/lfs/iptables b/lfs/iptables index 33a00e4a4e..ceb560d951 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -98,7 +98,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --prefix=/usr --with-ksource=/usr/src/linux \ --libdir=/lib --includedir=/usr/include --enable-libipq \ --libexecdir=/lib --bindir=/sbin \ - --sbindir=/sbin --mandir=/usr/share/man + --sbindir=/sbin --mandir=/usr/share/man \ + --with-pkgconfigdir=/usr/lib/pkgconfig cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -- 2.39.2