X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/86f19908c924e2575febb7579650376fe38c35f8..fb3172fb14d906b83505b69c8513d53b57f606ed:/package/fuse/Makefile diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 4e228b3f1..60fb4bec5 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -16,7 +16,6 @@ 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))) @@ -43,8 +42,8 @@ $(PKG_BUILD_DIR)/.configured: --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,21 +58,15 @@ $(PKG_BUILD_DIR)/.configured: --disable-auto-modprobe \ --with-kernel=$(LINUX_DIR) \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) + rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ - install - touch $(PKG_BUILD_DIR)/.built - -$(IPKG_KMOD_FUSE): - 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)/ - $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR) + all install + touch $@ $(IPKG_LIBFUSE): mkdir -p $(IDIR_LIBFUSE)/usr/lib