From 773e8200874d9c7582996d89805f897e1f7447d3 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Wed, 1 Apr 2015 15:11:32 +0000 Subject: libreadline: cleanup Makefile, fix shlib perms Signed-off-by: Nicolas Thill git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45223 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libs/libreadline/Makefile | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'package/libs/libreadline/Makefile') diff --git a/package/libs/libreadline/Makefile b/package/libs/libreadline/Makefile index a9e6a22163..21c8b21649 100644 --- a/package/libs/libreadline/Makefile +++ b/package/libs/libreadline/Makefile @@ -19,6 +19,8 @@ PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=COPYING PKG_BUILD_PARALLEL:=1 +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -38,27 +40,22 @@ define Package/libreadline/description history expansion on previous commands. endef -define Build/Configure - $(CP) $(SCRIPT_DIR)/config.guess $(SCRIPT_DIR)/config.sub $(PKG_BUILD_DIR)/support/ - $(call Build/Configure/Default, \ - --enable-shared \ - --enable-static \ - --without-curses \ - bash_cv_wcwidth_broken=no \ - bash_cv_func_sigsetjmp=yes \ - ) -endef +# prevent "autoreconf" from removing "aclocal.m4" +PKG_REMOVE_FILES:= + +CONFIGURE_ARGS += \ + --enable-shared \ + --enable-static \ + --with-curses \ + +CONFIGURE_VARS += \ + bash_cv_wcwidth_broken=no \ + bash_cv_func_sigsetjmp=yes \ TARGET_CPPFLAGS:=-I. -I.. $(TARGET_CPPFLAGS) TARGET_CFLAGS += $(FPIC) -define Build/Compile - $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install -endef - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(1)/usr/include/ -- cgit v1.2.3