Browse Source

remove LINUX_HEADER_DIR

Waldemar Brodkorb 10 years ago
parent
commit
0a936812d6
4 changed files with 2 additions and 6 deletions
  1. 0 1
      mk/vars.mk
  2. 1 1
      package/iproute2/Makefile
  3. 1 1
      package/libcap/Makefile
  4. 0 3
      toolchain/kernel-headers/Makefile

+ 0 - 1
mk/vars.mk

@@ -136,7 +136,6 @@ FLAGS_FOR_BUILD=	${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD}
 PATCH=			${BASH} $(SCRIPT_DIR)/patch.sh
 SED:=			sed -i -e
 LINUX_DIR:=		$(BUILD_DIR)/linux
-LINUX_HEADER_DIR:=	$(STAGING_DIR)/linux-header
 KERNEL_MODULE_FLAGS:=	ARCH=${ARCH} KERNELVERSION="2.6" \
 			KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \
 			PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \

+ 1 - 1
package/iproute2/Makefile

@@ -47,7 +47,7 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK
 CONFIG_STYLE:=		minimal
 TARGET_CFLAGS+=		-D_GNU_SOURCE
 XAKE_FLAGS+=		CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" \
-			CFLAGS_FOR_BUILD+="-I${LINUX_HEADER_DIR}/include"
+			CFLAGS_FOR_BUILD+="-I${LINUX_DIR}/include"
 CONFIGURE_ENV+=		CC="${TARGET_CC}" IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}"
 
 ip-install:

+ 1 - 1
package/libcap/Makefile

@@ -20,7 +20,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CPPFLAGS_FOR_BUILD+=	-I$(LINUX_HEADER_DIR)/include
+CPPFLAGS_FOR_BUILD+=	-I$(LINUX_DIR)/include
 CONFIG_STYLE:=		manual
 
 libcap-install:

+ 0 - 3
toolchain/kernel-headers/Makefile

@@ -10,9 +10,6 @@ $(WRKBUILD)/.headers:
 	$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(STAGING_DIR)/usr \
 		headers_install
-	$(MAKE) -C $(WRKBUILD) HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
-		INSTALL_HDR_PATH=$(LINUX_HEADER_DIR) \
-		headers_install
 ifeq ($(ARCH),cris)
 ifeq ($(CPU_ARCH),crisv32)
 	cd $(STAGING_DIR)/usr/include && ln -sf arch-v32/arch arch