diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-04-20 19:57:16 +0000 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-04-20 19:57:16 +0000 |
| commit | 06b48c151814a0dd5611478beee69d6f3185d467 (patch) | |
| tree | 074e422e460e40d8a010fd374613476845175856 | |
| parent | 99db580108f61f11b63bb0bd84d731b127a20ba2 (diff) | |
| download | crosstool-ng-06b48c151814a0dd5611478beee69d6f3185d467.tar.gz crosstool-ng-06b48c151814a0dd5611478beee69d6f3185d467.tar.bz2 crosstool-ng-06b48c151814a0dd5611478beee69d6f3185d467.zip | |
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(-)
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/saveSample.sh.in | 0 |
3 files changed, 8 insertions, 10 deletions
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 @@ -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 index b9bced49..b9bced49 100755..100644 --- a/scripts/saveSample.sh.in +++ b/scripts/saveSample.sh.in |