From e9d7b877c2d0d8dc34e062fca31e069820f1a232 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 9 Dec 2010 10:55:08 +0100 Subject: cups: avoid using non reevaluated $(STAGING_DIR) Signed-off-by: Lionel Landwerlin Signed-off-by: Peter Korsgaard --- CHANGES | 6 +++--- package/cups/cups.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index c95830737..5885ae9e3 100644 --- a/CHANGES +++ b/CHANGES @@ -3,9 +3,9 @@ Ccache support reworked. Now used for both host and target compilation, and cache is stored in ~/.buildroot-ccache. - Updated/fixed packages: busybox, dbus, cloop, gdk-pixbuf, - hostapd, i2c-tools, libconfig, m4, openssh, openssl, qt, - sdl_gfx, sdl_sound, udev, usbutils, xz, zlib + Updated/fixed packages: busybox, dbus, cloop, cups, + gdk-pixbuf, hostapd, i2c-tools, libconfig, m4, openssh, + openssl, qt, sdl_gfx, sdl_sound, udev, usbutils, xz, zlib New packages: dhrystone, lsuio, rsh-redone, whetstone diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 776fb57ae..169cdb334 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -8,7 +8,7 @@ CUPS_NAME = cups-$(CUPS_VERSION) CUPS_DIR = $(BUILD_DIR)/$(CUPS_NAME) CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION) CUPS_SOURCE:=$(CUPS_NAME)-source.tar.bz2 -CUPS_DESTDIR:=$(STAGING_DIR)/usr/lib +CUPS_DESTDIR = $(STAGING_DIR)/usr/lib CUPS_CAT:=$(BZCAT) ifeq ($(BR2_PACKAGE_DBUS),y) -- cgit v1.2.3