diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-11-04 17:42:44 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-11-06 09:39:45 +0100 |
| commit | 1a24fdf11ca5d311d2cce3f26737a3cb7a88dbe6 (patch) | |
| tree | 1467a7658a7e1c8379f004347d398a5980eefe46 /rules/mii-diag.make | |
| parent | 269ece6b2309e87cd11fe47f0f8021f0a337b05f (diff) | |
| download | ptxdist-1a24fdf11ca5d311d2cce3f26737a3cb7a88dbe6.tar.gz ptxdist-1a24fdf11ca5d311d2cce3f26737a3cb7a88dbe6.tar.xz | |
[mii-diag] make use of MAKE_OPT and INSTALL_OPT
don't define MII_DIAG_PKGDIR
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'rules/mii-diag.make')
| -rw-r--r-- | rules/mii-diag.make | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/rules/mii-diag.make b/rules/mii-diag.make index 03b854c1f..c1b58c5c3 100644 --- a/rules/mii-diag.make +++ b/rules/mii-diag.make @@ -1,7 +1,7 @@ # -*-makefile-*- -# $Id: template 1681 2004-09-01 18:12:49Z $ # -# Copyright (C) 2004 by BSP +# Copyright (C) 2004 by Benedikt Spranger +# 2009 by Marc Kleine-Budde <mkl@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -24,7 +24,6 @@ MII_DIAG_TARBALL := mii-diag_$(MII_DIAG_VERSION).orig.$(MII_DIAG_SUFFIX) MII_DIAG_URL := $(PTXCONF_SETUP_DEBMIRROR)/pool/main/m/mii-diag/$(MII_DIAG_TARBALL) MII_DIAG_SOURCE := $(SRCDIR)/$(MII_DIAG_TARBALL) MII_DIAG_DIR := $(BUILDDIR)/$(MII_DIAG) -MII_DIAG_PKGDIR := $(PKGDIR)/$(MII_DIAG) # ---------------------------------------------------------------------------- # Get @@ -41,23 +40,14 @@ $(MII_DIAG_SOURCE): MII_DIAG_PATH := PATH=$(CROSS_PATH) MII_DIAG_ENV := $(CROSS_ENV) -MII_DIAG_MAKEVARS := $(CROSS_ENV_CC) mii-diag +MII_DIAG_MAKE_OPT := $(CROSS_ENV_CC) mii-diag +MII_DIAG_INSTALL_OPT := install-mii-diag $(STATEDIR)/mii-diag.prepare: @$(call targetinfo) @$(call touch) # ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/mii-diag.install: - @$(call targetinfo) - cd $(MII_DIAG_DIR) && $(MAKE) DESTDIR=$(SYSROOT) install-mii-diag - cd $(MII_DIAG_DIR) && $(MAKE) DESTDIR=$(MII_DIAG_PKGDIR) install-mii-diag - @$(call touch) - -# ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -69,11 +59,11 @@ $(STATEDIR)/mii-diag.targetinstall: @$(call install_fixup, mii-diag,PRIORITY,optional) @$(call install_fixup, mii-diag,VERSION,$(MII_DIAG_VERSION)) @$(call install_fixup, mii-diag,SECTION,base) - @$(call install_fixup, mii-diag,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup, mii-diag,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, mii-diag,DEPENDS,) @$(call install_fixup, mii-diag,DESCRIPTION,missing) - @$(call install_copy, mii-diag, 0, 0, 0755, $(MII_DIAG_DIR)/mii-diag, /usr/sbin/mii-diag) + @$(call install_copy, mii-diag, 0, 0, 0755, -, /usr/sbin/mii-diag) @$(call install_finish, mii-diag) |