Updated to new upstream release (v0.9.1)

[openwrt.git] / openwrt / package / fuse / Makefile

diff --git a/openwrt/package/fuse/Makefile b/openwrt/package/fuse/Makefile
index 6d9a98d..60fb4be 100644 (file)
--- a/openwrt/package/fuse/Makefile
+++ b/openwrt/package/fuse/Makefile
@@ -7,27 +7,19 @@ PKG_VERSION:=2.2.1
 PKG_RELEASE:=1
 PKG_MD5SUM:=250d89b9c7b6ecf531df60c67f75737d
 
 PKG_RELEASE:=1
 PKG_MD5SUM:=250d89b9c7b6ecf531df60c67f75737d
 

-PKG_SOURCE_URL:= \
-       @SF/$(PKG_NAME) \
-       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 

-include $(TOPDIR)/package/templates.mk
+include $(TOPDIR)/package/rules.mk

 
 

-$(eval $(call PKG_template,KMOD_FUSE,kmod-fuse,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 $(eval $(call PKG_template,LIBFUSE,libfuse,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,FUSE_UTILS,fuse-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 $(eval $(call PKG_template,LIBFUSE,libfuse,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,FUSE_UTILS,fuse-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 

-COMPILE_TARGETS += install-dev
-CLEAN_TARGETS += uninstall-dev
-
-include $(TOPDIR)/package/rules.mk
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:

        (cd $(PKG_BUILD_DIR); \
                rm -rf config.{cache,status} ; \
                touch configure.in ; \
        (cd $(PKG_BUILD_DIR); \
                rm -rf config.{cache,status} ; \
                touch configure.in ; \


@@ -50,8 +42,8 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  --includedir=/usr/include \
                  --infodir=/usr/share/info \
                  --libdir=/usr/lib \
                  --includedir=/usr/include \
                  --infodir=/usr/share/info \
                  --libdir=/usr/lib \

-                 --libexecdir=/usr/lib/locate \
-                 --localstatedir=/var/lib \
+                 --libexecdir=/usr/lib \
+                 --localstatedir=/var \

                  --mandir=/usr/share/man \
                  --sbindir=/usr/sbin \
                  --sysconfdir=/etc \
                  --mandir=/usr/share/man \
                  --sbindir=/usr/sbin \
                  --sysconfdir=/etc \


@@ -66,48 +58,34 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
                  --disable-auto-modprobe \
                  --with-kernel=$(LINUX_DIR) \
        );
                  --disable-auto-modprobe \
                  --with-kernel=$(LINUX_DIR) \
        );

-       touch $(PKG_BUILD_DIR)/.configured
+       touch $@

 
 

-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       touch $(PKG_BUILD_DIR)/.built
-
-$(PKG_BUILD_DIR)/.installed: $(PKG_BUILD_DIR)/.built
+$(PKG_BUILD_DIR)/.built:
+       rm -rf $(PKG_INSTALL_DIR)

        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \

-               install
-       touch $(PKG_BUILD_DIR)/.installed
-
-$(IPKG_KMOD_FUSE): $(IDIR_KMOD_FUSE)/CONTROL/control $(PKG_BUILD_DIR)/.installed
-       mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)
-       cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.o \
-        $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/
-       $(RSTRIP_KMOD) $(IDIR_KMOD_FUSE)
-       mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR)
+               all install
+       touch $@

 
 

-$(IPKG_LIBFUSE): $(IDIR_LIBFUSE)/CONTROL/control $(PKG_BUILD_DIR)/.installed
+$(IPKG_LIBFUSE):

        mkdir -p $(IDIR_LIBFUSE)/usr/lib
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/
        chmod 0644 $(IDIR_LIBFUSE)/usr/lib/lib*.so*
        $(RSTRIP) $(IDIR_LIBFUSE)
        mkdir -p $(IDIR_LIBFUSE)/usr/lib
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/
        chmod 0644 $(IDIR_LIBFUSE)/usr/lib/lib*.so*
        $(RSTRIP) $(IDIR_LIBFUSE)

-       mkdir -p $(PACKAGE_DIR)

        $(IPKG_BUILD) $(IDIR_LIBFUSE) $(PACKAGE_DIR)
 
        $(IPKG_BUILD) $(IDIR_LIBFUSE) $(PACKAGE_DIR)
 

-$(IPKG_FUSE_UTILS): $(IDIR_FUSE_UTILS)/CONTROL/control $(PKG_BUILD_DIR)/.installed
+$(IPKG_FUSE_UTILS):

        mkdir -p $(IDIR_FUSE_UTILS)/usr/bin
        cp -fpR $(PKG_INSTALL_DIR)/usr/bin/fusermount $(IDIR_FUSE_UTILS)/usr/bin/
        $(RSTRIP) $(IDIR_FUSE_UTILS)
        mkdir -p $(IDIR_FUSE_UTILS)/usr/bin
        cp -fpR $(PKG_INSTALL_DIR)/usr/bin/fusermount $(IDIR_FUSE_UTILS)/usr/bin/
        $(RSTRIP) $(IDIR_FUSE_UTILS)

-       mkdir -p $(PACKAGE_DIR)

        $(IPKG_BUILD) $(IDIR_FUSE_UTILS) $(PACKAGE_DIR)
 
        $(IPKG_BUILD) $(IDIR_FUSE_UTILS) $(PACKAGE_DIR)
 

-$(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.installed
-       mkdir -p $(PKG_INSTALL_DIR)/usr/include
+$(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.built
+       mkdir -p $(STAGING_DIR)/usr/include

        cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse* $(STAGING_DIR)/usr/include/
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse* $(STAGING_DIR)/usr/include/

-       mkdir -p $(PKG_INSTALL_DIR)/usr/lib
+       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig

        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(STAGING_DIR)/usr/lib/
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} $(STAGING_DIR)/usr/lib/

-       mkdir -p $(PKG_INSTALL_DIR)/usr/lib/pkgconfig

        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/
        
 install-dev: $(STAGING_DIR)/usr/lib/libfuse.so
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/
        
 install-dev: $(STAGING_DIR)/usr/lib/libfuse.so


@@ -116,3 +94,6 @@ uninstall-dev:
        rm -rf $(STAGING_DIR)/usr/include/fuse*
        rm -rf $(STAGING_DIR)/usr/lib/libfuse.{a,so*}
        rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
        rm -rf $(STAGING_DIR)/usr/include/fuse*
        rm -rf $(STAGING_DIR)/usr/lib/libfuse.{a,so*}
        rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc

+
+install: install-dev
+clean: uninstall-dev