浏览代码

zlib: fix headers installation in target directory

Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Lionel Landwerlin 15 年之前
父节点
当前提交
5ad8ad0c37
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      CHANGES
  2. 2 2
      package/zlib/zlib.mk

+ 2 - 2
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
 

+ 2 - 2
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