summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2010-01-27 02:08:49 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-01-28 21:48:40 +0100
commit5ad8ad0c3729ccf7012f414969304950fb58c456 (patch)
treeacfa4daa36dde6bb6fbcc45f530e30ebde775be2
parent5082e476d1af0c1f5977a138146c9634f0b2f994 (diff)
zlib: fix headers installation in target directory
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES4
-rw-r--r--package/zlib/zlib.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 578543b19..97c55018a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,7 @@
libglib2, libpcap, libungif, libxml2, lighttpd, mesa, mpg123,
mtd-utils, neon, netstat-nat, openvpn, pcre, qt, rpm, sawman, sdl,
sdl_ttf, ser2net, sqlite, sshfs, tremor, u-boot, usb_modeswitch,
- usbutils, webkit, wpa_supplicant, xfsprogs
+ usbutils, webkit, wpa_supplicant, xfsprogs, zlib
Issues resolved (http://bugs.uclibc.org):
@@ -94,7 +94,7 @@
shared-mime-info, sfdisk, spawn-fcgi, speech-tools, sqlite, squashfs,
synergy, syslinux, sysklogd, target-binutils, tcpdump, torsmo, u-boot,
udpcast, util-linux, valgrind, vsftpd, wipe, wpa-supplicant, x11vnc,
- xdata_xcursor-themes, xboard, xfsprogs, xstroke, zlib
+ xdata_xcursor-themes, xboard, xfsprogs, xstroke, zlib[5~
Removed package: mdnsresponder, mpatrol, gcc 3.4.6 + 4.0.4, vice
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 5365b30ef..743247309 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -43,8 +43,8 @@ endef
ifeq ($(BR2_HAVE_DEVFILES),y)
define ZLIB_INSTALL_TARGET_HEADERS
- $(INSTALL) -D $(@D)/zlib.h $(STAGING_DIR)/usr/include/zlib.h
- $(INSTALL) $(@D)/zconf.h $(STAGING_DIR)/usr/include/
+ $(INSTALL) -D $(@D)/zlib.h $(TARGET_DIR)/usr/include/zlib.h
+ $(INSTALL) $(@D)/zconf.h $(TARGET_DIR)/usr/include/
endef
endif