summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2010-12-09 10:55:08 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-12-13 00:33:22 +0100
commite9d7b877c2d0d8dc34e062fca31e069820f1a232 (patch)
tree3e8acb0eb28a955a8c67bfc1bfd0aa28fbb9da09
parentb8c860992a408e7d650af369b39cc1c5edef5980 (diff)
cups: avoid using non reevaluated $(STAGING_DIR)
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES6
-rw-r--r--package/cups/cups.mk2
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)