diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-11 22:22:00 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-01-12 08:49:29 +0100 |
| commit | 03b1661e5ff482168067a4b356f6bdf1caf3cb4f (patch) | |
| tree | e4ecf5515ae46d1c6aeb1596ceee9d4f3bd95c2b /rules/busybox.make | |
| parent | 5343e018bbcef4e099d89353588fa07bbf514495 (diff) | |
| download | ptxdist-03b1661e5ff482168067a4b356f6bdf1caf3cb4f.tar.gz ptxdist-03b1661e5ff482168067a4b356f6bdf1caf3cb4f.tar.xz | |
[busybox] fix install
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/busybox.make')
| -rw-r--r-- | rules/busybox.make | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/rules/busybox.make b/rules/busybox.make index 8c7e5cd45..b832ce667 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -38,13 +38,6 @@ $(BUSYBOX_SOURCE): # ---------------------------------------------------------------------------- BUSYBOX_PATH := PATH=$(CROSS_PATH) -BUSYBOX_ENV := $(CROSS_ENV) - -BUSYBOX_MAKEVARS := \ - ARCH=$(PTXCONF_ARCH_STRING) \ - CROSS_COMPILE=$(COMPILER_PREFIX) \ - HOSTCC=$(HOSTCC) \ - SKIP_STRIP=y BUSYBOX_TAGS_OPT := TAGS tags @@ -52,8 +45,8 @@ $(STATEDIR)/busybox.prepare: @$(call targetinfo) @cd $(BUSYBOX_DIR) && \ - $(BUSYBOX_PATH) $(BUSYBOX_ENV) \ - $(MAKE) distclean $(BUSYBOX_MAKEVARS) + $(BUSYBOX_PATH) \ + $(MAKE) distclean $(BUSYBOX_MAKE_OPT) @grep -e PTXCONF_BUSYBOX_ $(PTXDIST_PTXCONFIG) | \ sed -e 's/PTXCONF_BUSYBOX_/CONFIG_/g' > $(BUSYBOX_DIR)/.config @@ -61,17 +54,16 @@ $(STATEDIR)/busybox.prepare: @$(call touch) -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- +BUSYBOX_MAKE_OPT := \ + ARCH=$(PTXCONF_ARCH_STRING) \ + CROSS_COMPILE=$(COMPILER_PREFIX) \ + HOSTCC=$(HOSTCC) \ + SKIP_STRIP=y -$(STATEDIR)/busybox.install: - @$(call targetinfo) - cd $(BUSYBOX_DIR) && $(BUSYBOX_PATH) $(MAKE) \ - $(BUSYBOX_MAKEVARS) CONFIG_PREFIX=$(SYSROOT) install - cd $(BUSYBOX_DIR) && $(BUSYBOX_PATH) $(MAKE) \ - $(BUSYBOX_MAKEVARS) CONFIG_PREFIX=$(BUSYBOX_PKGDIR) install - @$(call touch) +BUSYBOX_INSTALL_OPT := \ + $(BUSYBOX_MAKE_OPT) \ + CONFIG_PREFIX=$(BUSYBOX_PKGDIR) \ + install # ---------------------------------------------------------------------------- # Target-Install |