X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/35a181a51f7c0776c9e067133d21bb9af8e661d9..addc1928bde31342dc4e244d519036372bc5b4ff:/package/ncurses/Makefile diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index d9fc45a71..6da4299e8 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -12,13 +12,9 @@ PKG_NAME:=ncurses PKG_VERSION:=5.6 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/ncurses PKG_MD5SUM:=b6593abe1089d6aab1551c105c9300e3 -PKG_CAT:=zcat - -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -26,7 +22,6 @@ define Package/libncurses SECTION:=libs CATEGORY:=Libraries TITLE:=Terminal handling library - DESCRIPTION:=Terminal handling library URL:=http://www.gnu.org/software/ncurses/ endef @@ -80,8 +75,8 @@ define Build/Compile (cd $(PKG_BUILD_DIR); rm -f config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + CPPFLAGS="$(TARGET_CPPFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -145,34 +140,34 @@ define Package/libncurses/install endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/ncurses_dll.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/form.h $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/eti.h $(STAGING_DIR)/usr/include/ - mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(STAGING_DIR)/usr/lib/ + 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/ endef define Build/UninstallDev rm -rf \ - $(STAGING_DIR)/usr/include/curses.h \ - $(STAGING_DIR)/usr/include/ncurses.h \ - $(STAGING_DIR)/usr/include/ncurses_dll.h \ - $(STAGING_DIR)/usr/include/menu.h \ - $(STAGING_DIR)/usr/include/panel.h \ - $(STAGING_DIR)/usr/include/term{,cap}.h \ - $(STAGING_DIR)/usr/include/unctrl.h \ - $(STAGING_DIR)/usr/include/form.h \ - $(STAGING_DIR)/usr/include/eti.h \ - $(STAGING_DIR)/usr/lib/libcurses.so \ - $(STAGING_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} + $(1)/usr/include/curses.h \ + $(1)/usr/include/ncurses.h \ + $(1)/usr/include/ncurses_dll.h \ + $(1)/usr/include/menu.h \ + $(1)/usr/include/panel.h \ + $(1)/usr/include/term{,cap}.h \ + $(1)/usr/include/unctrl.h \ + $(1)/usr/include/form.h \ + $(1)/usr/include/eti.h \ + $(1)/usr/lib/libcurses.so \ + $(1)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} endef $(eval $(call BuildPackage,libncurses))