From: ulf at uclibc.org <ulf@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/ncurses
Date: Thu, 22 Jan 2009 22:58:56 +0000 (UTC) [thread overview]
Message-ID: <20090122225856.DFD08765E9@busybox.osuosl.org> (raw)
Author: ulf
Date: 2009-01-22 22:58:55 +0000 (Thu, 22 Jan 2009)
New Revision: 24971
Log:
Use /usr/lib for ncurses instead of /lib
Modified:
trunk/buildroot/package/ncurses/ncurses.mk
Changeset:
Modified: trunk/buildroot/package/ncurses/ncurses.mk
===================================================================
--- trunk/buildroot/package/ncurses/ncurses.mk 2009-01-22 22:58:29 UTC (rev 24970)
+++ trunk/buildroot/package/ncurses/ncurses.mk 2009-01-22 22:58:55 UTC (rev 24971)
@@ -58,7 +58,7 @@
--exec-prefix=/usr \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
- --libdir=/lib \
+ --libdir=/usr/lib \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
--datadir=/usr/share \
@@ -82,7 +82,7 @@
$(MAKE1) DESTDIR=$(STAGING_DIR) -C $(NCURSES_DIR) \
libs panel menu form headers
-$(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+$(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
$(MAKE1) \
prefix=$(STAGING_DIR)/usr/ \
exec_prefix=$(STAGING_DIR) \
@@ -92,7 +92,7 @@
datadir=$(STAGING_DIR)/usr/share \
sysconfdir=$(STAGING_DIR)/etc \
localstatedir=$(STAGING_DIR)/var \
- libdir=$(STAGING_DIR)/lib \
+ libdir=$(STAGING_DIR)/usr/lib \
infodir=$(STAGING_DIR)/usr/info \
mandir=$(STAGING_DIR)/usr/man \
includedir=$(STAGING_DIR)/usr/include \
@@ -102,8 +102,8 @@
chmod a-x $(NCURSES_DIR)/lib/libncurses.so*
touch -c $@
-$(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
- cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/
+$(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION): $(STAGING_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
+ cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PANEL),y)
cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/usr/lib/
endif
@@ -143,12 +143,12 @@
ln -fs libncurses.a libtermcap.a; \
)
(cd $(TARGET_DIR)/usr/include; ln -fs curses.h ncurses.h)
- rm -f $(TARGET_DIR)/lib/libncurses.so
- (cd $(TARGET_DIR)/usr/lib; ln -fs ../../lib/libncurses.so.$(NCURSES_VERSION) libncurses.so)
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+ rm -f $(TARGET_DIR)/usr/lib/libncurses.so
+ (cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.so.$(NCURSES_VERSION) libncurses.so)
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
touch -c $@
-ncurses: $(TARGET_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+ncurses: $(TARGET_DIR)/usr/lib/libncurses.so.$(NCURSES_VERSION)
ncurses-unpacked: $(NCURSES_DIR)/.patched
@@ -157,7 +157,6 @@
ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE)
ncurses-clean:
- rm -f $(STAGING_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/libncurses.so*
rm -f $(STAGING_DIR)/usr/lib/libncurses.so* $(TARGET_DIR)/usr/lib/libncurses.so*
rm -rf $(STAGING_DIR)/usr/share/tabset $(TARGET_DIR)/usr/share/tabset
rm -rf $(STAGING_DIR)/usr/share/terminfo $(TARGET_DIR)/usr/share/terminfo
next reply other threads:[~2009-01-22 22:58 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-22 22:58 ulf at uclibc.org [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-03-01 22:35 [Buildroot] svn commit: trunk/buildroot/package/ncurses jacmet at uclibc.org
2009-01-23 23:02 ulf at uclibc.org
2009-01-24 6:33 ` Peter Korsgaard
2009-01-25 10:07 ` Thomas Lundquist
2009-01-25 20:56 ` Peter Korsgaard
2009-01-12 7:44 ulf at uclibc.org
2009-01-11 13:33 thomasez at uclibc.org
2008-07-01 19:24 jacmet at uclibc.org
2008-04-10 8:17 nkukard at uclibc.org
2008-04-10 5:14 nkukard at uclibc.org
2008-04-09 11:38 nkukard at uclibc.org
2008-04-09 22:35 ` Hamish Moffatt
2008-04-10 5:14 ` Nigel Kukard
2008-04-10 7:06 ` Peter Korsgaard
2008-04-10 9:10 ` Hamish Moffatt
2008-03-31 14:44 jacmet at uclibc.org
2008-03-07 13:57 ninevoltz at uclibc.org
2008-03-07 14:03 ` Peter Korsgaard
2008-03-06 18:19 ninevoltz at uclibc.org
2008-03-07 13:30 ` Peter Korsgaard
2007-07-23 8:33 ulf at uclibc.org
2007-06-25 16:56 aldot at uclibc.org
2007-06-25 16:35 aldot at uclibc.org
2007-06-25 15:38 aldot at uclibc.org
2007-06-23 13:56 aldot at uclibc.org
2007-03-07 14:46 aldot at uclibc.org
2007-01-30 17:47 aldot at uclibc.org
2007-01-22 23:52 andersen at uclibc.org
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090122225856.DFD08765E9@busybox.osuosl.org \
--to=ulf@uclibc.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox