jengelh at computergmbh
Jul 31, 2007, 4:10 AM
Post #1 of 1
(547 views)
Permalink
|
|
[PATCH] Fix ip[6]t->xt symlinks during `make install`
|
|
Hi,
I have just noticed that building a recent svn snapshot with rpm yields
bogus symlinks:
lrwxrwxrwx 1 99 99 62 Jul 31 13:02 libipt_tcpmss.so ->
/var/tmp/iptables-1.3.8-build/usr/lib/iptables/libxt_tcpmss.so
(make install with DESTDIR=/var/tmp/iptables-1.3.8)
Fix below.
Thanks,
Jan
===
$< includes DESTDIR, which is not what DESTDIR is meant for.
Since ipt, ip6t and xt are all in the same directory, we can
even do without any paths.
Signed-off-by: Jan Engelhardt <jengelh [at] gmx>
---
extensions/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: iptables/extensions/Makefile
===================================================================
--- iptables.orig/extensions/Makefile
+++ iptables/extensions/Makefile
@@ -195,12 +195,12 @@ extensions/libip6t_matches.man: $(patsub
PF_XTLIBS=$(foreach T, $(PFX_EXT_SLIB), $(DEST_IPT_LIBDIR)/libipt_$(T).so)
$(PF_XTLIBS): $(DEST_IPT_LIBDIR)/libipt_%.so : $(DEST_IPT_LIBDIR)/libxt_%.so
@[ -d $(DEST_IPT_LIBDIR)/ ] || mkdir -p $(DEST_IPT_LIBDIR)/
- ln -sf $< $@
+ ln -sf libipt_$*.so $@
PF6_XTLIBS=$(foreach T, $(PFX_EXT_SLIB), $(DEST_IPT_LIBDIR)/libip6t_$(T).so)
$(PF6_XTLIBS): $(DEST_IPT_LIBDIR)/libip6t_%.so : $(DEST_IPT_LIBDIR)/libxt_%.so
@[ -d $(DEST_IPT_LIBDIR)/ ] || mkdir -p $(DEST_IPT_LIBDIR)/
- ln -sf $< $@
+ ln -sf libip6t_$*.so $@
$(DEST_IPT_LIBDIR)/libipt_%.so: extensions/libipt_%.so
@[ -d $(DEST_IPT_LIBDIR)/ ] || mkdir -p $(DEST_IPT_LIBDIR)/
|
