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(-)
This commit is contained in:
Yann E. MORIN" 2009-04-20 19:57:16 +00:00
parent 99db580108
commit 06b48c1518
3 changed files with 8 additions and 10 deletions

View File

@ -104,6 +104,7 @@ uninstall: real-uninstall
# Build rules # Build rules
build-bin: ct-ng scripts/crosstool-NG.sh scripts/saveSample.sh build-bin: ct-ng scripts/crosstool-NG.sh scripts/saveSample.sh
@chmod 755 $^
build-lib: paths.mk build-lib: paths.mk
@ -168,15 +169,10 @@ clean-man:
#-------------------------------------- #--------------------------------------
# Check for --local setup # Check for --local setup
ifeq ($(strip $(LOCAL)),1) ifeq ($(strip $(LOCAL)),y)
real-install: real-install:
@echo " CHMOD 'ct-ng'" @true
@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
real-uninstall: real-uninstall:
@true @true

8
configure vendored
View File

@ -246,7 +246,7 @@ __EOF__
while [ $# -ne 0 ]; do while [ $# -ne 0 ]; do
case "$1" in case "$1" in
--local) LOCAL_set=1; shift;; --local) LOCAL_set="y"; shift;;
--prefix*) set_prefix "$1" "$2" && shift || shift 2;; --prefix*) set_prefix "$1" "$2" && shift || shift 2;;
--bindir*) set_bindir "$1" "$2" && shift || shift 2;; --bindir*) set_bindir "$1" "$2" && shift || shift 2;;
--libdir*) set_libdir "$1" "$2" && shift || shift 2;; --libdir*) set_libdir "$1" "$2" && shift || shift 2;;
@ -262,7 +262,7 @@ done
[ -z "${PREFIX}" ] && set_prefix "" "${PREFIX_DEFAULT}" [ -z "${PREFIX}" ] && set_prefix "" "${PREFIX_DEFAULT}"
# Special case when installing locally # Special case when installing locally
if [ "${LOCAL_set}" = "1" ]; then if [ "${LOCAL_set}" = "y" ]; then
set_prefix "" "$( pwd )" set_prefix "" "$( pwd )"
set_bindir "" "$( pwd )" set_bindir "" "$( pwd )"
set_libdir "" "$( pwd )" set_libdir "" "$( pwd )"
@ -419,5 +419,7 @@ crosstool-NG configured as follows:
Now run: Now run:
make make
make install
__EOF__ __EOF__
if [ "${LOCAL_set}" = "y" ]; then
printf " make install\n"
fi

0
scripts/saveSample.sh.in Executable file → Normal file
View File