diff options
| author | /C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org </C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org> | 2007-07-24 06:08:05 +0000 |
|---|---|---|
| committer | /C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org </C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org> | 2007-07-24 06:08:05 +0000 |
| commit | 8607d16d0d6368fcf822ecdc00beeebe746c6b34 (patch) | |
| tree | 2292f5ee3d12925dbd0a313526628022d0198828 | |
| parent | c83eb3756cbb16269f8d4d8b9fa272868f7047e6 (diff) | |
Introduces DEST_IPT_LIBDIR to simplify $(DESTDIR)$(LIBDIR)/iptables
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | extensions/Makefile | 17 |
2 files changed, 10 insertions, 8 deletions
@@ -68,6 +68,7 @@ endif ifndef IPT_LIBDIR IPT_LIBDIR:=$(LIBDIR)/iptables endif +DEST_IPT_LIBDIR:=$(DESTDIR)$(LIBDIR)/iptables ifndef NO_SHARED_LIBS DEPFILES = $(SHARED_LIBS:%.so=%.d) diff --git a/extensions/Makefile b/extensions/Makefile index 5921763..c149375 100644 --- a/extensions/Makefile +++ b/extensions/Makefile @@ -49,15 +49,16 @@ OPTIONALS+=$(patsubst %,IPv6:%,$(PF6_EXT_SLIB_OPTS)) ifndef NO_SHARED_LIBS SHARED_LIBS+=$(foreach T,$(PF_EXT_SLIB),extensions/libipt_$(T).so) SHARED_SE_LIBS+=$(foreach T,$(PF_EXT_SE_SLIB),extensions/libipt_$(T).so) -EXTRA_INSTALLS+=$(foreach T, $(PF_EXT_SLIB), $(DESTDIR)$(LIBDIR)/iptables/libipt_$(T).so) -EXTRA_INSTALLS+=$(foreach T, $(PF_EXT_SE_SLIB), $(DESTDIR)$(LIBDIR)/iptables/libipt_$(T).so) +EXTRA_INSTALLS+=$(foreach T, $(PF_EXT_SLIB), $(DEST_IPT_LIBDIR)/libipt_$(T).so) +EXTRA_INSTALLS+=$(foreach T, $(PF_EXT_SE_SLIB), $(DEST_IPT_LIBDIR)/libipt_$(T).so) ifeq ($(DO_IPV6), 1) SHARED_LIBS+=$(foreach T,$(PF6_EXT_SLIB),extensions/libip6t_$(T).so) SHARED_SE_LIBS+=$(foreach T,$(PF6_EXT_SE_SLIB),extensions/libip6t_$(T).so) -EXTRA_INSTALLS+=$(foreach T, $(PF6_EXT_SLIB), $(DESTDIR)$(LIBDIR)/iptables/libip6t_$(T).so) -EXTRA_INSTALLS+=$(foreach T, $(PF6_EXT_SE_SLIB), $(DESTDIR)$(LIBDIR)/iptables/libip6t_$(T).so) +EXTRA_INSTALLS+=$(foreach T, $(PF6_EXT_SLIB), $(DEST_IPT_LIBDIR)/libip6t_$(T).so) +EXTRA_INSTALLS+=$(foreach T, $(PF6_EXT_SE_SLIB), $(DEST_IPT_LIBDIR)/libip6t_$(T).so) endif + else # NO_SHARED_LIBS EXT_OBJS+=$(foreach T,$(PF_EXT_SLIB),extensions/libipt_$(T).o) EXT_OBJS+=$(foreach T,$(PF_EXT_SE_SLIB),extensions/libipt_$(T).o) @@ -171,10 +172,10 @@ extensions/libip6t_matches.man: $(patsubst %, extensions/libip6t_%.man, $(PF6_EX done ;\ fi >>extensions/libip6t_matches.man -$(DESTDIR)$(LIBDIR)/iptables/libipt_%.so: extensions/libipt_%.so - @[ -d $(DESTDIR)$(LIBDIR)/iptables ] || mkdir -p $(DESTDIR)$(LIBDIR)/iptables +$(DEST_IPT_LIBDIR)/libipt_%.so: extensions/libipt_%.so + @[ -d $(DEST_IPT_LIBDIR)/ ] || mkdir -p $(DEST_IPT_LIBDIR)/ cp $< $@ -$(DESTDIR)$(LIBDIR)/iptables/libip6t_%.so: extensions/libip6t_%.so - @[ -d $(DESTDIR)$(LIBDIR)/iptables ] || mkdir -p $(DESTDIR)$(LIBDIR)/iptables +$(DEST_IPT_LIBDIR)/libip6t_%.so: extensions/libip6t_%.so + @[ -d $(DEST_IPT_LIBDIR)/ ] || mkdir -p $(DEST_IPT_LIBDIR)/ cp $< $@ |