diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2003-09-17 22:47:50 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2003-09-17 22:47:50 +0000 |
| commit | b268ac8833251c336ee60a27cef39b286e15828f (patch) | |
| tree | fd78c9703e437e3cc240eb1b44de0056e0515cb3 /rules/tcpwrapper.make | |
| parent | 559235f8d02d20cf404429de89c51181ca194aec (diff) | |
| download | ptxdist-b268ac8833251c336ee60a27cef39b286e15828f.tar.gz ptxdist-b268ac8833251c336ee60a27cef39b286e15828f.tar.xz | |
* added CROSS_PATH to environment
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunk@364 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/tcpwrapper.make')
| -rw-r--r-- | rules/tcpwrapper.make | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/rules/tcpwrapper.make b/rules/tcpwrapper.make index 0b597deca..9060c703b 100644 --- a/rules/tcpwrapper.make +++ b/rules/tcpwrapper.make @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Id: tcpwrapper.make,v 1.5 2003/09/17 13:22:39 robert Exp $ +# $Id: tcpwrapper.make,v 1.6 2003/09/17 22:47:50 mkl Exp $ # # (c) 2003 by Pengutronix e.K., Hildesheim, Germany # See CREDITS for details about who has contributed to this project. @@ -22,7 +22,6 @@ TCPWRAPPER = tcp_wrappers_7.6 TCPWRAPPER_URL = ftp://ftp.porcupine.org/pub/security/$(TCPWRAPPER).tar.gz TCPWRAPPER_SOURCE = $(SRCDIR)/$(TCPWRAPPER).tar.gz TCPWRAPPER_DIR = $(BUILDDIR)/$(TCPWRAPPER) -TCPWRAPPER_EXTRACT = gzip -dc TCPWRAPPER_PTXPATCH = tcp_wrappers_7.6-ptx1 TCPWRAPPER_PTXPATCH_URL = http://www.pengutronix.de/software/ptxdist/temporary-src/$(TCPWRAPPER_PTXPATCH).diff @@ -40,11 +39,11 @@ $(STATEDIR)/tcpwrapper.get: $(TCPWRAPPER_SOURCE) $(TCPWRAPPER_PTXPATCH_SOURCE) $(TCPWRAPPER_SOURCE): @$(call targetinfo, $(TCPWRAPPER_SOURCE)) - wget -P $(SRCDIR) $(PASSIVEFTP) $(TCPWRAPPER_URL) + @$(call get, $(TCPWRAPPER_URL)) $(TCPWRAPPER_PTXPATCH_SOURCE): @$(call targetinfo, $(TCPWRAPPER_PTXPATCH_SOURCE)) - wget -P $(SRCDIR) $(PASSIVEFTP) $(TCPWRAPPER_PTXPATCH_URL) + @$(call get, $(TCPWRAPPER_PTXPATCH_URL)) # ---------------------------------------------------------------------------- # Extract @@ -55,7 +54,7 @@ tcpwrapper_extract: $(STATEDIR)/tcpwrapper.extract $(STATEDIR)/tcpwrapper.extract: $(STATEDIR)/tcpwrapper.get @$(call targetinfo, tcpwrapper.extract) @$(call clean, $(TCPWRAPPER_DIR)) - $(TCPWRAPPER_EXTRACT) $(TCPWRAPPER_SOURCE) | $(TAR) -C $(BUILDDIR) -xf - + @$(call extract, $(TCPWRAPPER_SOURCE)) cd $(TCPWRAPPER_DIR) && patch -p1 < $(TCPWRAPPER_PTXPATCH_SOURCE) touch $@ @@ -75,11 +74,11 @@ $(STATEDIR)/tcpwrapper.prepare: $(STATEDIR)/virtual-xchain.install $(STATEDIR)/t tcpwrapper_compile: $(STATEDIR)/tcpwrapper.compile -TCPWRAPPER_ENVIRONMENT = $(CROSS_ENV) +TCPWRAPPER_ENV = $(CROSS_ENV) $(CROSS_PATCH) $(STATEDIR)/tcpwrapper.compile: $(STATEDIR)/tcpwrapper.prepare @$(call targetinfo, tcpwrapper.compile) - $(TCPWRAPPER_ENVIRONMENT) make -C $(TCPWRAPPER_DIR) linux + $(TCPWRAPPER_ENV) make -C $(TCPWRAPPER_DIR) linux touch $@ # ---------------------------------------------------------------------------- @@ -100,11 +99,11 @@ tcpwrapper_targetinstall: $(STATEDIR)/tcpwrapper.targetinstall $(STATEDIR)/tcpwrapper.targetinstall: $(STATEDIR)/tcpwrapper.install @$(call targetinfo, tcpwrapper.targetinstall) - ifeq (y, $(PTXCONF_TCPWRAPPER_INSTALL_TCPD)) +ifdef PTXCONF_TCPWRAPPER_INSTALL_TCPD mkdir -p $(ROOTDIR)/usr/sbin install $(TCPWRAPPER_DIR)/tcpd $(ROOTDIR)/usr/sbin $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/usr/sbin/tcpd - endif +endif touch $@ # ---------------------------------------------------------------------------- |