From 2ffe012ebb6fe6bf1bd8db2305e50d2dc30453a3 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Fri, 4 Aug 2006 11:59:52 +0000 Subject: set PATH in rules.mk git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4438 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/busybox/Makefile | 4 ++-- package/diag/Makefile | 1 - package/fuse/Makefile | 1 - package/iptables/Makefile | 8 ++++---- package/libpcap/Makefile | 1 - package/madwifi/Makefile | 1 - package/mini_fo/Makefile | 1 - package/openssl/Makefile | 1 - package/shfs/Makefile | 1 - package/switch/Makefile | 1 - package/wlcompat/Makefile | 2 -- 11 files changed, 6 insertions(+), 16 deletions(-) (limited to 'package') diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 67f7ce1816..6a359688a5 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -38,12 +38,12 @@ endef define Build/Configure $(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config - yes '' | PATH="$(TARGET_PATH)" $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \ + yes '' | $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \ -C $(PKG_BUILD_DIR) oldconfig endef define Package/busybox/install - PATH="$(TARGET_PATH)" $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \ + $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \ PREFIX="$(1)" EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install -rm -rf $(1)/lib64 endef diff --git a/package/diag/Makefile b/package/diag/Makefile index 024426f8b1..3ffd2f460f 100644 --- a/package/diag/Makefile +++ b/package/diag/Makefile @@ -35,7 +35,6 @@ define Build/Compile $(MAKE) -C "$(LINUX_DIR)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ - PATH="$(TARGET_PATH)" \ SUBDIRS="$(PKG_BUILD_DIR)" \ EXTRA_CFLAGS="-DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include" \ modules diff --git a/package/fuse/Makefile b/package/fuse/Makefile index f690f56fa7..fd55c71dc7 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -82,7 +82,6 @@ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - PATH="$(TARGET_PATH)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef diff --git a/package/iptables/Makefile b/package/iptables/Makefile index bf8124084c..8d77fb43f4 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -161,9 +161,9 @@ endef define Build/Compile chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test* mkdir -p $(PKG_INSTALL_DIR) - PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \ + COPT_FLAGS="$(TARGET_CFLAGS)" \ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install install-devel @@ -171,9 +171,9 @@ endef define Build/InstallDev - PATH="$(TARGET_PATH)" $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" \ + COPT_FLAGS="$(TARGET_CFLAGS)" \ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ DESTDIR="$(STAGING_DIR)" \ install install-devel diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 155748a472..1d9d4371fb 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -71,7 +71,6 @@ define Build/Compile mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \ - PATH=$(TARGET_PATH) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 96ca1baf36..380ec4ad61 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -50,7 +50,6 @@ ifeq ($(findstring PCI,$(BUS)),PCI) endif MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \ - PATH="$(TARGET_PATH)" \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ CC="$(TARGET_CC)" \ diff --git a/package/mini_fo/Makefile b/package/mini_fo/Makefile index 6cba9db170..2e98efffda 100644 --- a/package/mini_fo/Makefile +++ b/package/mini_fo/Makefile @@ -33,7 +33,6 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - PATH="$(TARGET_PATH)" \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ KERNELVERSION="$(KERNEL)" \ diff --git a/package/openssl/Makefile b/package/openssl/Makefile index bbbd2073ed..be5b4a6d06 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -52,7 +52,6 @@ define Build/Configure $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure $(SED) s/OPENWRT_OPTIMIZATION_FLAGS/$(BR2_TARGET_OPTIMIZATION)/g $(PKG_BUILD_DIR)/Configure (cd $(PKG_BUILD_DIR); \ - PATH=$(TARGET_PATH) \ ./Configure linux-openwrt \ --prefix=/usr \ --openssldir=/etc/ssl \ diff --git a/package/shfs/Makefile b/package/shfs/Makefile index 63a1108e6f..dbaca66913 100644 --- a/package/shfs/Makefile +++ b/package/shfs/Makefile @@ -43,7 +43,6 @@ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - PATH="$(TARGET_PATH)" \ OFLAGS="$(TARGET_CFLAGS)" \ CC="$(TARGET_CC)" \ LINKER="$(TARGET_CC)" \ diff --git a/package/switch/Makefile b/package/switch/Makefile index 860e530c4c..8b5e7b324c 100644 --- a/package/switch/Makefile +++ b/package/switch/Makefile @@ -35,7 +35,6 @@ define Build/Compile $(MAKE) -C "$(LINUX_DIR)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ - PATH="$(TARGET_PATH)" \ SUBDIRS="$(PKG_BUILD_DIR)" \ EXTRA_CFLAGS="-DBCMGPIO2" \ modules diff --git a/package/wlcompat/Makefile b/package/wlcompat/Makefile index a42cdd2050..d3ccf88101 100644 --- a/package/wlcompat/Makefile +++ b/package/wlcompat/Makefile @@ -46,7 +46,6 @@ define Build/Compile $(MAKE) -C "$(LINUX_DIR)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ - PATH="$(TARGET_PATH)" \ SUBDIRS="$(PKG_BUILD_DIR)" \ EXTRA_CFLAGS="-DDEBUG -I$(LINUX_DIR)/arch/mips/bcm947xx/include -I$(PKG_BUILD_DIR)/include" \ modules @@ -54,7 +53,6 @@ define Build/Compile $(MAKE) -C "$(LINUX_DIR)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ - PATH="$(TARGET_PATH)" \ SUBDIRS="$(PKG_BUILD_DIR)" \ EXTRA_CFLAGS="-I$(LINUX_DIR)/arch/mips/bcm947xx/include -I$(PKG_BUILD_DIR)/include" \ modules -- cgit v1.2.3