fix menuconfig entry for cifs

[openwrt.git] / openwrt / target / linux / package / shfs / Makefile

diff --git a/openwrt/target/linux/package/shfs/Makefile b/openwrt/target/linux/package/shfs/Makefile
index 5380792..4625bdb 100644 (file)
--- a/openwrt/target/linux/package/shfs/Makefile
+++ b/openwrt/target/linux/package/shfs/Makefile
@@ -15,13 +15,9 @@ PKG_CAT:=zcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 

-ifeq ($(KERNEL_DIR),)
-KERNEL_DIR:=$(LINUX_DIR)
-endif
-

 include $(TOPDIR)/package/rules.mk
 
 include $(TOPDIR)/package/rules.mk
 

-$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))
+$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))

 
 $(PKG_BUILD_DIR)/.configured:
        touch $@
 
 $(PKG_BUILD_DIR)/.configured:
        touch $@


@@ -37,14 +33,14 @@ $(PKG_BUILD_DIR)/.built:
                CC="$(TARGET_CC)" \
                LINKER="$(TARGET_CC)" \
                KERNEL="$(LINUX_VERSION)" \
                CC="$(TARGET_CC)" \
                LINKER="$(TARGET_CC)" \
                KERNEL="$(LINUX_VERSION)" \

-               KERNEL_SOURCES="$(KERNEL_DIR)" \
+               KERNEL_SOURCES="$(LINUX_DIR)" \

                ROOT="$(PKG_INSTALL_DIR)" \
                module module-install
        touch $@
 
 $(IPKG_KMOD_SHFS):
        install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)
                ROOT="$(PKG_INSTALL_DIR)" \
                module module-install
        touch $@
 
 $(IPKG_KMOD_SHFS):
        install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)

-       cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \
+       $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \

         $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/
        $(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR)
 
         $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/
        $(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR)