X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/93bdd996176c3237696e554d6d1b567ba29aca23..db99e7aa38bcbfea7e873db11fee1ec6a2c28b89:/package/fuse/Makefile

diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index c0dd9c160..60fb4bec5 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -16,11 +16,10 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 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)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); \
 		rm -rf config.{cache,status} ; \
 		touch configure.in ; \
@@ -43,8 +42,8 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --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 \
@@ -59,42 +58,30 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
 		  --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)" \
-		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)/
-	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 $(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 $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(IDIR_FUSE_UTILS) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.installed
+$(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/
 	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig