From: ninevoltz at uclibc.org <ninevoltz@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/bzip2
Date: Thu, 6 Mar 2008 09:56:11 -0800 (PST) [thread overview]
Message-ID: <20080306175611.EB4541201CA@busybox.net> (raw)
Author: ninevoltz
Date: 2008-03-06 09:56:10 -0800 (Thu, 06 Mar 2008)
New Revision: 21184
Log:
makefile cleanup for bzip2
Modified:
trunk/buildroot/package/bzip2/bzip2.mk
Changeset:
Modified: trunk/buildroot/package/bzip2/bzip2.mk
===================================================================
--- trunk/buildroot/package/bzip2/bzip2.mk 2008-03-06 17:55:51 UTC (rev 21183)
+++ trunk/buildroot/package/bzip2/bzip2.mk 2008-03-06 17:56:10 UTC (rev 21184)
@@ -29,7 +29,7 @@
$(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile-libbz2_so
touch $@
-$(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
+$(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \
-C $(BZIP2_DIR) -f Makefile-libbz2_so
@@ -37,17 +37,17 @@
$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \
-C $(BZIP2_DIR) libbz2.a
cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/usr/include/
- cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/lib/
+ cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/
cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/
(cd $(STAGING_DIR)/usr/lib/; \
ln -snf ../../lib/libbz2.so.$(BZIP2_VERSION) libbz2.so; \
)
- (cd $(STAGING_DIR)/lib; \
+ (cd $(STAGING_DIR)/usr/lib; \
ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \
)
-$(BZIP2_BINARY): $(STAGING_DIR)/lib/libbz2.so.$(BZIP2_VERSION)
+$(BZIP2_BINARY): $(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION)
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) bzip2 bzip2recover
touch -c $@
@@ -83,10 +83,10 @@
rm -rf $(TARGET_DIR)/share/locale
rm -rf $(TARGET_DIR)/usr/share/doc
-$(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/lib/libbz2.a
+$(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/usr/lib/libbz2.a
mkdir -p $(TARGET_DIR)/usr/include
cp $(STAGING_DIR)/usr/include/bzlib.h $(TARGET_DIR)/usr/include/
- cp $(STAGING_DIR)/lib/libbz2.a $(TARGET_DIR)/usr/lib/
+ cp $(STAGING_DIR)/usr/lib/libbz2.a $(TARGET_DIR)/usr/lib/
rm -f $(TARGET_DIR)/lib/libbz2.so
(cd $(TARGET_DIR)/usr/lib; \
ln -fs /usr/lib/libbz2.so.1.0 libbz2.so; \
next reply other threads:[~2008-03-06 17:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-06 17:56 ninevoltz at uclibc.org [this message]
2008-03-06 23:47 ` [Buildroot] svn commit: trunk/buildroot/package/bzip2 Hamish Moffatt
2008-03-06 23:56 ` Ulf Samuelsson
2008-03-07 0:01 ` Hamish Moffatt
2008-03-07 8:24 ` Hans-Christian Egtvedt
-- strict thread matches above, loose matches on Subject: below --
2009-01-20 22:25 ulf at uclibc.org
2007-06-25 14:53 aldot 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=20080306175611.EB4541201CA@busybox.net \
--to=ninevoltz@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