summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2010-12-09 09:55:13 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-12-12 23:40:54 (GMT)
commitdd15877acef78b36b6bc84467167ae86da577380 (patch)
tree9e451733905c060ab20ea7aafa849095be579d85
parent8c9476d72c45a607ccec49cea175ce736fb52527 (diff)
downloadbuildroot-dd15877acef78b36b6bc84467167ae86da577380.tar.gz
buildroot-dd15877acef78b36b6bc84467167ae86da577380.tar.bz2
bzip2: ensure target directories exist before copying into
Also simply installation rules a little [Peter: leave in busybox install fix] Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES2
-rw-r--r--package/bzip2/bzip2.mk4
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index ac5b8cf..1179ac5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,7 @@
Ccache support reworked. Now used for both host and target
compilation, and cache is stored in ~/.buildroot-ccache.
- Updated/fixed packages: at, busybox, dbus, cloop, cups,
+ Updated/fixed packages: at, busybox, bzip2, dbus, cloop, cups,
gdk-pixbuf, hostapd, i2c-tools, libconfig, m4, openssh,
openssl, pango, qt, rsync, sdl_gfx, sdl_sound, udev, usbutils,
xz, zlib
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 3f341ee..123e579 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/; \