diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-08-19 16:12:30 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-08-19 16:31:44 +0200 |
commit | 122927c3404348415ee5816a787b17d348b6407c (patch) | |
tree | f9e2e7bee9ecf33a333870c1894507d458cac1ba /rules/ncurses.make | |
parent | 370fb9406b6b6dc69f776e2561df478a455a5443 (diff) | |
download | ptxdist-122927c3404348415ee5816a787b17d348b6407c.tar.gz ptxdist-122927c3404348415ee5816a787b17d348b6407c.tar.xz |
ncurses: cleanups
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/ncurses.make')
-rw-r--r-- | rules/ncurses.make | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/rules/ncurses.make b/rules/ncurses.make index 719d48fd7..539a0b54a 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -25,14 +25,6 @@ NCURSES_SOURCE := $(SRCDIR)/$(NCURSES).$(NCURSES_SUFFIX) NCURSES_DIR := $(BUILDDIR)/$(NCURSES) # ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(NCURSES_SOURCE): - @$(call targetinfo) - @$(call get, NCURSES) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -113,11 +105,9 @@ endif NCURSES_WIDE := w endif -$(STATEDIR)/ncurses.install.post: +$(STATEDIR)/ncurses.install: @$(call targetinfo) - @$(call world/install.post, NCURSES) - - @cp -dp -- "$(NCURSES_PKGDIR)/usr/bin/"*config* "$(PTXCONF_SYSROOT_CROSS)/bin" + @$(call world/install, NCURSES) ifdef PTXCONF_NCURSES_WIDE_CHAR # Note: This tweak only works if we build the application with these settings! @@ -125,15 +115,21 @@ ifdef PTXCONF_NCURSES_WIDE_CHAR # For this, the links at runtime are required # for lib in $(NCURSES_LIBRARY_LIST); do \ - echo "INPUT(-l$${lib}w)" > $(SYSROOT)/lib/lib$${lib}.so ; \ + echo "INPUT(-l$${lib}w)" > $(NCURSES_PKGDIR)/lib/lib$${lib}.so ; \ done - ln -sf libncurses++w.a $(SYSROOT)/lib/libncurses++.a + ln -sf libncurses++w.a $(NCURSES_PKGDIR)/lib/libncurses++.a ln -sf -- "ncursesw$(NCURSES_MAJOR)-config" \ - "$(PTXCONF_SYSROOT_CROSS)/bin/ncurses$(NCURSES_MAJOR)-config" + "$(NCURSES_PKGDIR)/usr/bin/ncurses$(NCURSES_MAJOR)-config" endif @$(call touch) +$(STATEDIR)/ncurses.install.post: + @$(call targetinfo) + @$(call world/install.post, NCURSES) + @cp -dp -- "$(NCURSES_PKGDIR)/usr/bin/"*config* "$(PTXCONF_SYSROOT_CROSS)/bin" + @$(call touch) + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- |