diff options
| author | Travis Kemen <thepeople@openwrt.org> | 2010-03-05 20:12:24 +0000 |
|---|---|---|
| committer | Travis Kemen <thepeople@openwrt.org> | 2010-03-05 20:12:24 +0000 |
| commit | 0e0bf71ed982211d00813140b2c6771733ee0661 (patch) | |
| tree | 822f0d9730cf8e17e4f62056cb26b1e712a55fb2 | |
| parent | 8ee9f9ee04ae7a0380c8ec417cee43edc13c6301 (diff) | |
| download | upstream-0e0bf71ed982211d00813140b2c6771733ee0661.tar.gz upstream-0e0bf71ed982211d00813140b2c6771733ee0661.tar.bz2 upstream-0e0bf71ed982211d00813140b2c6771733ee0661.zip | |
this patch simplifies the Makefile by using PKG_INSTALL:=1 and fixes parallel build.
-Raphael
SVN-Revision: 19994
| -rw-r--r-- | package/ncurses/Makefile | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 0f8543bc75..1576637c2c 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,12 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ncurses PKG_VERSION:=5.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/ncurses PKG_MD5SUM:=cce05daf61a64501ef6cd8da1f727ec6 +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/libncurses @@ -42,19 +44,22 @@ CONFIGURE_ARGS += \ --with-terminfo-dirs=/usr/share/terminfo \ --with-default-terminfo-dir=/usr/share/terminfo -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - BUILD_CC="$(HOSTCC)" \ - HOSTCC="$(HOSTCC)" \ - HOSTCCFLAGS="" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - libs install.libs install.data +MAKE_FLAGS += \ + BUILD_CC="$(HOSTCC)" \ + HOSTCC="$(HOSTCC)" \ + HOSTCCFLAGS="" \ + libs + +define Build/Install/Default + $(MAKE_VARS) \ + $(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ + $(MAKE_INSTALL_FLAGS) \ + $(1) install.libs install.data; endef define Package/libncurses/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}*.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.so* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/share/terminfo (cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \ for dir in ??; do \ @@ -70,19 +75,11 @@ define Package/libncurses/install endef define Build/InstallDev - mkdir -p $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses.h $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses_dll.h $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/form.h $(1)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/eti.h $(1)/usr/include/ - mkdir -p $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/ endef $(eval $(call BuildPackage,libncurses)) |