fix ebtables compile

[openwrt.git] / package / fuse / Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 422499d..fda8f1c 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -13,12 +13,12 @@ PKG_NAME:=fuse
 PKG_VERSION:=2.5.3
 PKG_RELEASE:=1
 
 PKG_VERSION:=2.5.3
 PKG_RELEASE:=1
 

-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c
 PKG_CAT:=zcat
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c
 PKG_CAT:=zcat
 

+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk


@@ -123,29 +123,28 @@ define Build/InstallDev
 endef
        
 define Build/UninstallDev
 endef
        
 define Build/UninstallDev

-       rm -rf \
-               $(STAGING_DIR)/usr/include/fuse{,.h} \
+       rm -rf  $(STAGING_DIR)/usr/include/fuse{,.h} \

                $(STAGING_DIR)/usr/lib/libfuse.{a,so*} \
                $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
 endef
 
 define Package/fuse-utils/install
                $(STAGING_DIR)/usr/lib/libfuse.{a,so*} \
                $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
 endef
 
 define Package/fuse-utils/install

-       install -d -m0755 $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/bin

        $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
 endef
 
 define Package/kmod-fuse/install
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
 endef
 
 define Package/kmod-fuse/install

-       install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
+       $(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)

        $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \
                $(1)/lib/modules/$(LINUX_VERSION)/
        $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \
                $(1)/lib/modules/$(LINUX_VERSION)/

-       install -d -m0755 $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib

        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/

-       install -d -m0755 $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/bin

        $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
 endef
 
 define Package/libfuse/install
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/
 endef
 
 define Package/libfuse/install

-       install -d -m0755 $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib

        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
 endef
 
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/
 endef