Kill "./configure --local", it does not work and it is dangerous if one tries to "make uninstall"!
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jul 03 22:05:00 2007 +0000 (2007-07-03)
changeset 19847272dc0b12a
parent 197 9383bf4a2e2e
child 199 d799643901c3
Kill "./configure --local", it does not work and it is dangerous if one tries to "make uninstall"!
Makefile.in
configure
     1.1 --- a/Makefile.in	Mon Jul 02 19:40:54 2007 +0000
     1.2 +++ b/Makefile.in	Tue Jul 03 22:05:00 2007 +0000
     1.3 @@ -12,7 +12,6 @@
     1.4  DOCDIR := @@DOCDIR@@
     1.5  MANDIR := @@MANDIR@@
     1.6  DATE   := @@DATE@@
     1.7 -LOCAL  := @@LOCAL@@
     1.8  MAKE   := $(shell which make || type -p make || echo /usr/bin/make)
     1.9  
    1.10  ###############################################################################
    1.11 @@ -66,19 +65,12 @@
    1.12  #--------------------------------------
    1.13  # Install rules
    1.14  
    1.15 -# If using localy, don't install
    1.16 -install-local:
    1.17 -	@if [ "$(LOCAL)" = "1" ]; then                                      \
    1.18 -	     echo "You're using local copy as runtime. You can't install."; \
    1.19 -	     false;                                                         \
    1.20 -	 fi
    1.21 -
    1.22 -install-bin: install-local $(BINDIR)
    1.23 +install-bin: $(BINDIR)
    1.24  	@install -m 755 ct-ng $(BINDIR)/ct-ng
    1.25  
    1.26 -install-lib: install-local $(LIBDIR) install-lib-main install-lib-samples
    1.27 +install-lib: $(LIBDIR) install-lib-main install-lib-samples
    1.28  
    1.29 -install-lib-main: install-local $(LIBDIR)
    1.30 +install-lib-main: $(LIBDIR)
    1.31  	@for src_dir in config kconfig patches scripts tools; do            \
    1.32  	     tar cf - --exclude=.svn $${src_dir} |(cd $(LIBDIR); tar xf -); \
    1.33  	 done
    1.34 @@ -88,13 +80,13 @@
    1.35  
    1.36  # Samples need a little love:
    1.37  #  - change every occurence of CT_TOP_DIR to CT_LIB_DIR
    1.38 -install-lib-samples: install-local $(LIBDIR) install-lib-main
    1.39 +install-lib-samples: $(LIBDIR) install-lib-main
    1.40  	@tar cf - --exclude=.svn samples |(cd $(LIBDIR); tar xf -)
    1.41  	@for samp_file in $(LIBDIR)/samples/*/crosstool.config; do                  \
    1.42  	     sed -r -i -e 's,\$$\{CT_TOP_DIR\},\$$\{CT_LIB_DIR\},g;' $${samp_file}; \
    1.43  	 done
    1.44  
    1.45 -install-doc: install-local $(DOCDIR) $(MANDIR)
    1.46 +install-doc: $(DOCDIR) $(MANDIR)
    1.47  	@for doc_file in CREDITS docs/overview.txt; do  \
    1.48  	     install -m 644 "$${doc_file}" $(DOCDIR);   \
    1.49  	 done
     2.1 --- a/configure	Mon Jul 02 19:40:54 2007 +0000
     2.2 +++ b/configure	Tue Jul 03 22:05:00 2007 +0000
     2.3 @@ -9,7 +9,6 @@
     2.4  LIBDIR_set=
     2.5  DOCDIR_set=
     2.6  MANDIR_set=
     2.7 -LOCAL_set=
     2.8  
     2.9  get_optval(){
    2.10      local ret
    2.11 @@ -80,7 +79,6 @@
    2.12  Configuration:
    2.13    -h, --help              display this help and exit                                                                                                                  
    2.14    --prefix=PREFIX         install files in PREFIX [${PREFIX_DEFAULT}]
    2.15 -  --local                 don't install, and use current directory
    2.16  
    2.17  By default, \`make install' will install all the files in
    2.18  \`${PREFIX_DEFAULT}/bin', \`${PREFIX_DEFAULT}/lib' etc.  You can specify
    2.19 @@ -104,20 +102,12 @@
    2.20          --libdir*)  set_libdir "$1" "$2" && shift || shift 2;;
    2.21          --docdir*)  set_docdir "$1" "$2" && shift || shift 2;;
    2.22          --mandir*)  set_mandir "$1" "$2" && shift || shift 2;;
    2.23 -        --local)    LOCAL_set=1; shift;;
    2.24          --help|-h)  do_help; exit 0;;
    2.25          *)          do_help; exit 1;;
    2.26      esac
    2.27  done
    2.28  
    2.29  [ -z "${PREFIX}" ] && set_prefix "" "${PREFIX_DEFAULT}"
    2.30 -if [ "${LOCAL_set}" = "1" ]; then
    2.31 -    set_prefix "" $(pwd)
    2.32 -    set_bindir "" $(pwd)
    2.33 -    set_libdir "" $(pwd)
    2.34 -    set_docdir "" $(pwd)/docs
    2.35 -    set_mandir "" $(pwd)/docs
    2.36 -fi
    2.37  
    2.38  sed -r -e "s,@@BINDIR@@,${BINDIR},g;"   \
    2.39         -e "s,@@LIBDIR@@,${LIBDIR},g;"   \
    2.40 @@ -125,7 +115,6 @@
    2.41         -e "s,@@MANDIR@@,${MANDIR},g;"   \
    2.42         -e "s,@@VERSION@@,${VERSION},g;" \
    2.43         -e "s,@@DATE@@,${DATE},g;"       \
    2.44 -       -e "s,@@LOCAL@@,${LOCAL_set},g;" \
    2.45         Makefile.in >Makefile
    2.46  
    2.47  cat <<__EOF__