From 2153abeb822fbf35e0b1165815ac2dae033a9076 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 12 Jul 2010 16:40:33 +0000 Subject: [PATCH] [packages] ntfsprogs: disable crypto support explicitly, use libtool fixup & PKG_INSTALL, use $(CP) instead in $(INSTALL_BIN) (perms already set by upstream 'make install'), cleanup git-svn-id: svn://svn.openwrt.org/openwrt/packages@22149 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- utils/ntfsprogs/Makefile | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/utils/ntfsprogs/Makefile b/utils/ntfsprogs/Makefile index a1d3aedfc..7dd3e19aa 100644 --- a/utils/ntfsprogs/Makefile +++ b/utils/ntfsprogs/Makefile @@ -15,6 +15,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/linux-ntfs PKG_MD5SUM:=2c402b647bb7aeb1d3f8ce1cc354fd68 +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/ntfsprogs @@ -33,33 +36,24 @@ endef CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ + --disable-crypto \ --disable-gnome-vfs \ --disable-ntfsmount -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) \ - CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - prefix=/usr \ - DESTDIR=$(PKG_INSTALL_DIR) \ - all install -endef - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/ntfs $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/ntfs $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs.{la,a,so*} $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs.{la,a,so*} $(1)/usr/lib/ endef define Package/ntfsprogs/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs.so.* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libntfs.so.* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ntfsfix $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ntfsfix $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/sbin - $(FIND) $(PKG_INSTALL_DIR)/usr/sbin -type f -exec $(INSTALL_BIN) {} $(1)/usr/sbin \; + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ endef $(eval $(call BuildPackage,ntfsprogs))