add a default for PKG_BUILD_DIR and PKG_INSTALL_DIR (will use KERNEL_BUILD_DIR if...

[openwrt.git] / package / busybox / Makefile

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index eae037a..fc5711f 100644 (file)
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads \
 PKG_MD5SUM:=5728403bce309cdabcffa414e2e64052
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=libcgi
-
 include $(INCLUDE_DIR)/package.mk
 
 init-y :=
@@ -62,10 +59,9 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
-               EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+               EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
                ARCH="$(ARCH)" \
                IPKG_ARCH="$(ARCH)" \
-               EXTRA_LIBS="$(STAGING_DIR)/usr/lib/libcgi.a" \
                all
 endef
 
@@ -73,11 +69,10 @@ define Package/busybox/install
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
-               EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
+               EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
                ARCH="$(ARCH)" \
                IPKG_ARCH="$(ARCH)" \
                CONFIG_PREFIX="$(1)" \
-               EXTRA_LIBS="$(STAGING_DIR)/usr/lib/libcgi.a" \
                install
        $(INSTALL_DIR) $(1)/etc/init.d
        for tmp in $(init-y); do \