From 6c598100eebc31da459687a8e64f5dc56752fa89 Mon Sep 17 00:00:00 2001 From: Konstantin Belov Date: Tue, 18 Sep 2012 12:46:05 +0400 Subject: [PATCH] Build fails on Red Hat-like systems if TOUCH variable is defined as /usr/bin/touch. --- WCS_Tools/cores_make/wlan.mk | 4 ++-- WCS_Tools/rules.mk | 4 ++-- WCS_Tools/utils.mk | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/WCS_Tools/cores_make/wlan.mk b/WCS_Tools/cores_make/wlan.mk index 8745d33..2415fd7 100644 --- a/WCS_Tools/cores_make/wlan.mk +++ b/WCS_Tools/cores_make/wlan.mk @@ -188,7 +188,7 @@ endif cd $(WLAN_COMPAT_WIRELESS_DIR) ; \ sh ./scripts/admin-refresh.sh ; \ ./scripts/driver-select ti - $(TOUCH) $(WLAN_COMPAT_WIRELESS_DIR)/drivers/net/Makefile + touch $(WLAN_COMPAT_WIRELESS_DIR)/drivers/net/Makefile @$(ECHO) "...done" wlan-make-private: @@ -198,7 +198,7 @@ wlan-make-private: cd $(WLAN_COMPAT_WIRELESS_DIR) ; \ sh ./scripts/admin-refresh.sh ; \ ./scripts/driver-select ti - $(TOUCH) $(WLAN_COMPAT_WIRELESS_DIR)/drivers/net/Makefile + touch $(WLAN_COMPAT_WIRELESS_DIR)/drivers/net/Makefile $(MAKE) -C $(WLAN_COMPAT_WIRELESS_DIR) KLIB=$(KERNEL_DIR) KLIB_BUILD=$(KERNEL_DIR) -j$(NTHREADS) $(FIND) $(WLAN_COMPAT_WIRELESS_DIR) -name "*.ko" -exec $(COPY) {} $(WL12xx_KO_INSTALLER) \; @$(ECHO) "...done" diff --git a/WCS_Tools/rules.mk b/WCS_Tools/rules.mk index 4b99a5d..4674948 100755 --- a/WCS_Tools/rules.mk +++ b/WCS_Tools/rules.mk @@ -314,7 +314,7 @@ ifeq ($(CONFIG_WLAN), y) $(COPY) $(WLAN_MANIFEST_DIR)/$(WLAN_ANDROID_MANIFEST_NAME) $(MYDROID)/.repo/$(WLAN_ANDROID_LOCAL_MANIFEST_NAME) else $(COPY) $(WIIST_PATH)/misc/empty_manifest.xml $(MYDROID)/.repo/$(WLAN_ANDROID_LOCAL_MANIFEST_NAME) - $(TOUCH) $(MYDROID)/.repo/$(WLAN_ANDROID_LOCAL_MANIFEST_NAME) + touch $(MYDROID)/.repo/$(WLAN_ANDROID_LOCAL_MANIFEST_NAME) endif $(PROGRESS_FETCH_BT_MANIFEST): @@ -344,7 +344,7 @@ ifeq ($(CONFIG_BT), y) $(COPY) $(BT_MANIFEST_DIR)/$(BT_ANDROID_MANIFEST_NAME) $(MYDROID)/.repo/$(BT_ANDROID_LOCAL_MANIFEST_NAME) else $(COPY) $(WIIST_PATH)/misc/empty_manifest.xml $(MYDROID)/.repo/$(BT_ANDROID_LOCAL_MANIFEST_NAME) - $(TOUCH) $(MYDROID)/.repo/$(BT_ANDROID_LOCAL_MANIFEST_NAME) + touch $(MYDROID)/.repo/$(BT_ANDROID_LOCAL_MANIFEST_NAME) endif gps-create-local-android-manifest: diff --git a/WCS_Tools/utils.mk b/WCS_Tools/utils.mk index bf704f2..b8a87f8 100755 --- a/WCS_Tools/utils.mk +++ b/WCS_Tools/utils.mk @@ -46,7 +46,6 @@ TAR:=/bin/tar FIND:=/usr/bin/find SED:=/bin/sed MKFS_EXT4:=/sbin/mkfs.ext4 -TOUCH:=/usr/bin/touch GIT:=/usr/bin/git CAT:=/bin/cat