Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: llandwerlin at gmail.com <llandwerlin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 16/17] bzip2: ensure target directories exist before copying into
Date: Wed,  8 Dec 2010 10:54:08 +0100	[thread overview]
Message-ID: <1291802049-18764-17-git-send-email-llandwerlin@gmail.com> (raw)
In-Reply-To: <1291802049-18764-1-git-send-email-llandwerlin@gmail.com>

From: Lionel Landwerlin <llandwerlin@gmail.com>

Also simply installation rules a little

Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
---
 package/bzip2/bzip2.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 3f341ee..38bb461 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -39,7 +39,9 @@ define BZIP2_BUILD_CMDS
 endef
 
 define BZIP2_INSTALL_STAGING_CMDS
-	cp $(@D)/bzlib.h $(STAGING_DIR)/usr/include/
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
+	$(MAKE) PREFIX=$(STAGING_DIR)/usr -C $(@D) install
+	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/lib
 	cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(STAGING_DIR)/usr/lib/
 	cp $(@D)/libbz2.a $(STAGING_DIR)/usr/lib/
 	(cd $(STAGING_DIR)/usr/lib/; \
@@ -49,9 +51,7 @@ define BZIP2_INSTALL_STAGING_CMDS
 	)
 endef
 
-# make sure busybox doesn't get overwritten by make install
 define BZIP2_INSTALL_TARGET_CMDS
-	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,bzip2 bunzip2 bzcat)
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
 	$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install
 	cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(TARGET_DIR)/usr/lib/
-- 
1.7.2.3

  parent reply	other threads:[~2010-12-08  9:54 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-08  9:53 [Buildroot] [pull request] For branch pre-package-generation-2011.02 llandwerlin at gmail.com
2010-12-08  9:53 ` [Buildroot] [PATCH 01/17] gdk-pixbuf: fix dependency on libiconv llandwerlin at gmail.com
2010-12-08 19:08   ` Thomas Petazzoni
2010-12-08 21:00     ` Lionel Landwerlin
2010-12-08  9:53 ` [Buildroot] [PATCH 02/17] dbus: ensure startup script is well installed llandwerlin at gmail.com
2010-12-08  9:53 ` [Buildroot] [PATCH 03/17] hostapd: ensure hostapd binaries are installed in the right place llandwerlin at gmail.com
2010-12-08  9:53 ` [Buildroot] [PATCH 04/17] cloop: ensure target directory exist before copying into llandwerlin at gmail.com
2010-12-08  9:53 ` [Buildroot] [PATCH 05/17] ifplugd: ensure target directories " llandwerlin at gmail.com
2010-12-12 22:59   ` Peter Korsgaard
2010-12-08  9:53 ` [Buildroot] [PATCH 06/17] i2c-tools: ensure binaries are installed in the right place llandwerlin at gmail.com
2010-12-08 19:10   ` Thomas Petazzoni
2010-12-12 23:00     ` Peter Korsgaard
2010-12-12 23:01   ` Peter Korsgaard
2010-12-08  9:53 ` [Buildroot] [PATCH 07/17] udev: ensure startup script is well installed llandwerlin at gmail.com
2010-12-08  9:54 ` [Buildroot] [PATCH 08/17] busybox: move udhcp script from skeleton to package llandwerlin at gmail.com
2010-12-08 19:12   ` Thomas Petazzoni
2010-12-08 20:55     ` Lionel Landwerlin
2010-12-08 21:16       ` Thomas Petazzoni
2010-12-12 23:04       ` Peter Korsgaard
2010-12-08  9:54 ` [Buildroot] [PATCH 09/17] sdl_sound: avoid using non reevaluated $(STAGING_DIR) llandwerlin at gmail.com
2010-12-08  9:54 ` [Buildroot] [PATCH 10/17] sdl_gfx: " llandwerlin at gmail.com
2010-12-08  9:54 ` [Buildroot] [PATCH 11/17] cups: " llandwerlin at gmail.com
2010-12-08  9:54 ` [Buildroot] [PATCH 12/17] rsync: avoid using non reevaluated $(TARGET_DIR) in RSYNC_INSTALL_TARGET_OPT llandwerlin at gmail.com
2010-12-08  9:54 ` [Buildroot] [PATCH 13/17] gdk-pixbuf: ensure startup script is well installed llandwerlin at gmail.com
2010-12-08  9:54 ` [Buildroot] [PATCH 14/17] pango: " llandwerlin at gmail.com
2010-12-08 19:13   ` Thomas Petazzoni
2010-12-08  9:54 ` [Buildroot] [PATCH 15/17] at: " llandwerlin at gmail.com
2010-12-08  9:54 ` llandwerlin at gmail.com [this message]
2010-12-12 23:08   ` [Buildroot] [PATCH 16/17] bzip2: ensure target directories exist before copying into Peter Korsgaard
2010-12-08  9:54 ` [Buildroot] [PATCH 17/17] directfb-examples: rework target installation rule to match package infrastructure llandwerlin at gmail.com

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=1291802049-18764-17-git-send-email-llandwerlin@gmail.com \
    --to=llandwerlin@gmail.com \
    --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