diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-07-16 15:24:10 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-07-16 15:24:10 +0000 |
| commit | eb7322cc2ae8f09edc8bf1bc5955cdfde48224df (patch) | |
| tree | 8557597e06abbc6d51e4d5736f4dadf00b06b472 /rules/portmap.make | |
| parent | 32701c970c5433493819f921b5b8481df785fe63 (diff) | |
| download | ptxdist-eb7322cc2ae8f09edc8bf1bc5955cdfde48224df.tar.gz ptxdist-eb7322cc2ae8f09edc8bf1bc5955cdfde48224df.tar.xz | |
fix portmap dependency for tcpwrapper; patch by David Updegraff
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@2961 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/portmap.make')
| -rw-r--r-- | rules/portmap.make | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/rules/portmap.make b/rules/portmap.make index e57bffb17..bc5596ebb 100644 --- a/rules/portmap.make +++ b/rules/portmap.make @@ -55,6 +55,10 @@ $(STATEDIR)/portmap.extract: $(STATEDIR)/portmap.get @$(call disable_sh, $(PORTMAP_DIR)/Makefile, AUX) # FIXME: uggly, make patch perl -i -p -e "s/const/__const/g" $(PORTMAP_DIR)/portmap.c +# remove TCP_WRAP assuption if no TCP_WRAP +ifndef PTXCONF_TCPWRAPPER + sed -ie 's/$$(WRAP_DIR)\/libwrap.a//' $(PORTMAP_DIR)/Makefile +endif touch $@ # ---------------------------------------------------------------------------- @@ -64,9 +68,11 @@ $(STATEDIR)/portmap.extract: $(STATEDIR)/portmap.get portmap_prepare: $(STATEDIR)/portmap.prepare portmap_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/tcpwrapper.install \ - $(STATEDIR)/portmap.extract + $(STATEDIR)/virtual-xchain.install +ifdef PTXCONF_TCPWRAPPER +portmap_prepare_deps += $(STATEDIR)/tcpwrapper.install +endif +portmap_prepare_deps += $(STATEDIR)/portmap.extract $(STATEDIR)/portmap.prepare: $(portmap_prepare_deps) @$(call targetinfo, $@) @@ -80,7 +86,10 @@ portmap_compile: $(STATEDIR)/portmap.compile PORTMAP_ENV = $(CROSS_ENV) PORTMAP_PATH = PATH=$(CROSS_PATH) + +ifdef PTXCONF_TCPWRAPPER PORTMAP_MAKEVARS = WRAP_DIR=$(CROSS_LIB_DIR)/lib +endif $(STATEDIR)/portmap.compile: $(STATEDIR)/portmap.prepare @$(call targetinfo, $@) |