update requested by Oliver Ertl

[openwrt.git] / package / fuse / Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 30b03a8..35d096a 100644 (file)
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fuse
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fuse

-PKG_VERSION:=2.2.1
+PKG_VERSION:=2.3.0

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=250d89b9c7b6ecf531df60c67f75737d
+PKG_MD5SUM:=0bee98df5b2a29841f75fc188975eabc

 
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz


@@ -30,33 +30,34 @@ $(PKG_BUILD_DIR)/.configured:
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                ./configure \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(TARGET_CFLAGS)" \
                ./configure \

-                 --target=$(GNU_TARGET_NAME) \
-                 --host=$(GNU_TARGET_NAME) \
-                 --build=$(GNU_HOST_NAME) \
-                 --program-prefix="" \
-                 --program-suffix="" \
-                 --prefix=/usr \
-                 --exec-prefix=/usr \
-                 --bindir=/usr/bin \
-                 --datadir=/usr/share \
-                 --includedir=/usr/include \
-                 --infodir=/usr/share/info \
-                 --libdir=/usr/lib \
-                 --libexecdir=/usr/lib \
-                 --localstatedir=/var \
-                 --mandir=/usr/share/man \
-                 --sbindir=/usr/sbin \
-                 --sysconfdir=/etc \
-                 $(DISABLE_LARGEFILE) \
-                 $(DISABLE_NLS) \
-                 --enable-shared \
-                 --enable-static \
-                 --disable-kernel-module \
-                 --enable-lib \
-                 --enable-util \
-                 --disable-example \
-                 --disable-auto-modprobe \
-                 --with-kernel=$(LINUX_DIR) \
+                       --target=$(GNU_TARGET_NAME) \
+                       --host=$(GNU_TARGET_NAME) \
+                       --build=$(GNU_HOST_NAME) \
+                       --program-prefix="" \
+                       --program-suffix="" \
+                       --prefix=/usr \
+                       --exec-prefix=/usr \
+                       --bindir=/usr/bin \
+                       --datadir=/usr/share \
+                       --includedir=/usr/include \
+                       --infodir=/usr/share/info \
+                       --libdir=/usr/lib \
+                       --libexecdir=/usr/lib \
+                       --localstatedir=/var \
+                       --mandir=/usr/share/man \
+                       --sbindir=/usr/sbin \
+                       --sysconfdir=/etc \
+                       $(DISABLE_LARGEFILE) \
+                       $(DISABLE_NLS) \
+                       --enable-shared \
+                       --enable-static \
+                       --disable-rpath \
+                       --disable-kernel-module \
+                       --enable-lib \
+                       --enable-util \
+                       --disable-example \
+                       --disable-auto-modprobe \
+                       --with-kernel=$(LINUX_DIR) \

        );
        touch $@
 
        );
        touch $@
 


@@ -71,7 +72,6 @@ $(PKG_BUILD_DIR)/.built:
 $(IPKG_LIBFUSE):
        mkdir -p $(IDIR_LIBFUSE)/usr/lib
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/
 $(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)
        $(IPKG_BUILD) $(IDIR_LIBFUSE) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_LIBFUSE)
        $(IPKG_BUILD) $(IDIR_LIBFUSE) $(PACKAGE_DIR)
 


@@ -83,17 +83,25 @@ $(IPKG_FUSE_UTILS):
 
 $(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_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/
+       cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse.h $(STAGING_DIR)/usr/include/
+       mkdir -p $(STAGING_DIR)/usr/lib
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.a $(STAGING_DIR)/usr/lib/
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so* $(STAGING_DIR)/usr/lib/

        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
        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/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/
        cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/

+       $(SED) 's,-I$${includedir}/fuse,,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
+       $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc

        
 install-dev: $(STAGING_DIR)/usr/lib/libfuse.so
 
 uninstall-dev:
        
 install-dev: $(STAGING_DIR)/usr/lib/libfuse.so
 
 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 \
+               $(STAGING_DIR)/usr/include/fuse.h \
+               $(STAGING_DIR)/usr/lib/libfuse.a \
+               $(STAGING_DIR)/usr/lib/libfuse.so* \
+               $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc \

 
 

-install: install-dev
+compile: install-dev

 clean: uninstall-dev
 clean: uninstall-dev