X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/dc0b369ea1bb98a9835cfac7ff3899797e65227e..29c1e23114477a83fd45531f876946220d398366:/openwrt/target/linux/package/ieee80211-dscape/Makefile?ds=inline

diff --git a/openwrt/target/linux/package/ieee80211-dscape/Makefile b/openwrt/target/linux/package/ieee80211-dscape/Makefile
index 90d55b3c1..3de9b34fb 100644
--- a/openwrt/target/linux/package/ieee80211-dscape/Makefile
+++ b/openwrt/target/linux/package/ieee80211-dscape/Makefile
@@ -9,40 +9,35 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,KMOD_IEEE80211_DSCAPE,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
-
-ifeq ($(KERNEL_DIR),)
-KERNEL_DIR:=$(LINUX_DIR)
-endif
-KERNEL_VERSION=$(shell echo "$(LINUX_VERSION)" | cut -d. -f1,2)
+$(eval $(call PKG_template,KMOD_IEEE80211_DSCAPE,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
 
 $(PKG_BUILD_DIR)/.prepared:
 	mkdir -p $(PKG_BUILD_DIR)
-	cp -fpR ./src/* $(PKG_BUILD_DIR)/
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 	touch $@
 
 $(PKG_BUILD_DIR)/.configured:
 	touch $@
 
 $(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C "$(KERNEL_DIR)" \
+	$(MAKE) -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
 		PATH="$(TARGET_PATH)" \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
-		LINUXINCLUDE="-I$(shell pwd)/src/include -I$(KERNEL_DIR)/include" \
+		LINUXINCLUDE="-I$(shell pwd)/src/include -I$(LINUX_DIR)/include" \
 		modules
 	touch $@
 	
 $(IPKG_KMOD_IEEE80211_DSCAPE):
 	install -m0755 -d $(IDIR_KMOD_IEEE80211_DSCAPE)/lib/modules/$(LINUX_VERSION)
 	#install -m0755 -d $(IDIR_KMOD_IEEE80211_DSCAPE)/etc/modules.d
-	cp -fpR $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_IEEE80211_DSCAPE)/lib/modules/$(LINUX_VERSION)
+	$(CP) $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_IEEE80211_DSCAPE)/lib/modules/$(LINUX_VERSION)
 	$(IPKG_BUILD) $(IDIR_KMOD_IEEE80211_DSCAPE) $(PACKAGE_DIR)
 
 install-dev:
 	mkdir -p $(STAGING_DIR)/usr/include/ieee80211-dscape
-	cp -fpR src/include/* $(STAGING_DIR)/usr/include/ieee80211-dscape/
+	$(CP) src/include/* $(STAGING_DIR)/usr/include/ieee80211-dscape/
 
 uninstall-dev:
 	rm -rf $(STAGING_DIR)/usr/include/ieee80211-dscape