summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2010-12-09 10:55:09 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-12-13 00:34:01 +0100
commit8c874a334edb4d14b73a3964e90b20e78729fc93 (patch)
treeded7f7d00d50f85e473720758c485426705db026
parente9d7b877c2d0d8dc34e062fca31e069820f1a232 (diff)
rsync: avoid using non reevaluated $(TARGET_DIR) in RSYNC_INSTALL_TARGET_OPT
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES3
-rw-r--r--package/rsync/rsync.mk18
2 files changed, 11 insertions, 10 deletions
diff --git a/CHANGES b/CHANGES
index 5885ae9e3..a31fb5d5d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,8 @@
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
+ openssl, qt, rsync, sdl_gfx, sdl_sound, udev, usbutils, xz,
+ zlib
New packages: dhrystone, lsuio, rsh-redone, whetstone
diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index e1bb28e0d..5ffbfbb3e 100644
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -4,19 +4,19 @@
#
#############################################################
-RSYNC_VERSION:=3.0.7
-RSYNC_SOURCE:=rsync-$(RSYNC_VERSION).tar.gz
-RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/src
-RSYNC_INSTALL_STAGING:=NO
-RSYNC_INSTALL_TARGET:=YES
-RSYNC_CONF_OPT=$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
+RSYNC_VERSION := 3.0.7
+RSYNC_SOURCE := rsync-$(RSYNC_VERSION).tar.gz
+RSYNC_SITE := http://rsync.samba.org/ftp/rsync/src
+RSYNC_INSTALL_STAGING = NO
+RSYNC_INSTALL_TARGET = YES
+RSYNC_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
ifeq ($(BR2_ENABLE_DEBUG),y)
-RSYNC_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \
+RSYNC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \
install
else
-RSYNC_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \
+RSYNC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALLCMD='./install-sh -c' \
STRIPPROG="$(TARGET_STRIP)" install-strip
endif
-RSYNC_CONF_OPT:=--with-included-popt
+RSYNC_CONF_OPT = --with-included-popt
$(eval $(call AUTOTARGETS,package,rsync))