From 06b48c151814a0dd5611478beee69d6f3185d467 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 20 Apr 2009 19:57:16 +0000
Subject: [PATCH] Set the execute bit on generated script at build time, not
 install time. Do not advertise "make install" when ./configure-d with
 "--local".

 -------- diffstat follows --------
 /trunk/configure   |    8     5     3     0 +++++---
 /trunk/Makefile.in |   10     3     7     0 +++-------
 2 files changed, 8 insertions(+), 10 deletions(-)
---
 Makefile.in              | 10 +++-------
 configure                |  8 +++++---
 scripts/saveSample.sh.in |  0
 3 files changed, 8 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 scripts/saveSample.sh.in

diff --git a/Makefile.in b/Makefile.in
index c9e94a29..32c9a1ed 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,6 +104,7 @@ uninstall: real-uninstall
 # Build rules
 
 build-bin: ct-ng scripts/crosstool-NG.sh scripts/saveSample.sh
+	@chmod 755 $^
 
 build-lib: paths.mk
 
@@ -168,15 +169,10 @@ clean-man:
 #--------------------------------------
 # Check for --local setup
 
-ifeq ($(strip $(LOCAL)),1)
+ifeq ($(strip $(LOCAL)),y)
 
 real-install:
-	@echo "  CHMOD  'ct-ng'"
-	@chmod a+x ct-ng
-	@echo "  CHMOD  'scripts/crosstool-NG.sh'"
-	@chmod a+x scripts/crosstool-NG.sh
-	@echo "  CHMOD  'scripts/saveSample.sh'"
-	@chmod a+x scripts/saveSample.sh
+	@true
 
 real-uninstall:
 	@true
diff --git a/configure b/configure
index fde61a69..677b2587 100755
--- a/configure
+++ b/configure
@@ -246,7 +246,7 @@ __EOF__
 
 while [ $# -ne 0 ]; do
     case "$1" in
-        --local)    LOCAL_set=1; shift;;
+        --local)    LOCAL_set="y"; shift;;
         --prefix*)  set_prefix "$1" "$2" && shift || shift 2;;
         --bindir*)  set_bindir "$1" "$2" && shift || shift 2;;
         --libdir*)  set_libdir "$1" "$2" && shift || shift 2;;
@@ -262,7 +262,7 @@ done
 [ -z "${PREFIX}" ] && set_prefix "" "${PREFIX_DEFAULT}"
 
 # Special case when installing locally
-if [ "${LOCAL_set}" = "1" ]; then
+if [ "${LOCAL_set}" = "y" ]; then
     set_prefix "" "$( pwd )"
     set_bindir "" "$( pwd )"
     set_libdir "" "$( pwd )"
@@ -419,5 +419,7 @@ crosstool-NG configured as follows:
 
 Now run:
   make
-  make install
 __EOF__
+if [ "${LOCAL_set}" = "y" ]; then
+    printf "  make install\n"
+fi
diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in
old mode 100755
new mode 100644