# HG changeset patch # User "Yann E. MORIN" # Date 1183500300 0 # Node ID 47272dc0b12a744da30e36e5ff12133d30073316 # Parent 9383bf4a2e2e021e8376bb6fc7bacd86682efc65 Kill "./configure --local", it does not work and it is dangerous if one tries to "make uninstall"! diff -r 9383bf4a2e2e -r 47272dc0b12a Makefile.in --- a/Makefile.in Mon Jul 02 19:40:54 2007 +0000 +++ b/Makefile.in Tue Jul 03 22:05:00 2007 +0000 @@ -12,7 +12,6 @@ DOCDIR := @@DOCDIR@@ MANDIR := @@MANDIR@@ DATE := @@DATE@@ -LOCAL := @@LOCAL@@ MAKE := $(shell which make || type -p make || echo /usr/bin/make) ############################################################################### @@ -66,19 +65,12 @@ #-------------------------------------- # Install rules -# If using localy, don't install -install-local: - @if [ "$(LOCAL)" = "1" ]; then \ - echo "You're using local copy as runtime. You can't install."; \ - false; \ - fi - -install-bin: install-local $(BINDIR) +install-bin: $(BINDIR) @install -m 755 ct-ng $(BINDIR)/ct-ng -install-lib: install-local $(LIBDIR) install-lib-main install-lib-samples +install-lib: $(LIBDIR) install-lib-main install-lib-samples -install-lib-main: install-local $(LIBDIR) +install-lib-main: $(LIBDIR) @for src_dir in config kconfig patches scripts tools; do \ tar cf - --exclude=.svn $${src_dir} |(cd $(LIBDIR); tar xf -); \ done @@ -88,13 +80,13 @@ # Samples need a little love: # - change every occurence of CT_TOP_DIR to CT_LIB_DIR -install-lib-samples: install-local $(LIBDIR) install-lib-main +install-lib-samples: $(LIBDIR) install-lib-main @tar cf - --exclude=.svn samples |(cd $(LIBDIR); tar xf -) @for samp_file in $(LIBDIR)/samples/*/crosstool.config; do \ sed -r -i -e 's,\$$\{CT_TOP_DIR\},\$$\{CT_LIB_DIR\},g;' $${samp_file}; \ done -install-doc: install-local $(DOCDIR) $(MANDIR) +install-doc: $(DOCDIR) $(MANDIR) @for doc_file in CREDITS docs/overview.txt; do \ install -m 644 "$${doc_file}" $(DOCDIR); \ done diff -r 9383bf4a2e2e -r 47272dc0b12a configure --- a/configure Mon Jul 02 19:40:54 2007 +0000 +++ b/configure Tue Jul 03 22:05:00 2007 +0000 @@ -9,7 +9,6 @@ LIBDIR_set= DOCDIR_set= MANDIR_set= -LOCAL_set= get_optval(){ local ret @@ -80,7 +79,6 @@ Configuration: -h, --help display this help and exit --prefix=PREFIX install files in PREFIX [${PREFIX_DEFAULT}] - --local don't install, and use current directory By default, \`make install' will install all the files in \`${PREFIX_DEFAULT}/bin', \`${PREFIX_DEFAULT}/lib' etc. You can specify @@ -104,20 +102,12 @@ --libdir*) set_libdir "$1" "$2" && shift || shift 2;; --docdir*) set_docdir "$1" "$2" && shift || shift 2;; --mandir*) set_mandir "$1" "$2" && shift || shift 2;; - --local) LOCAL_set=1; shift;; --help|-h) do_help; exit 0;; *) do_help; exit 1;; esac done [ -z "${PREFIX}" ] && set_prefix "" "${PREFIX_DEFAULT}" -if [ "${LOCAL_set}" = "1" ]; then - set_prefix "" $(pwd) - set_bindir "" $(pwd) - set_libdir "" $(pwd) - set_docdir "" $(pwd)/docs - set_mandir "" $(pwd)/docs -fi sed -r -e "s,@@BINDIR@@,${BINDIR},g;" \ -e "s,@@LIBDIR@@,${LIBDIR},g;" \ @@ -125,7 +115,6 @@ -e "s,@@MANDIR@@,${MANDIR},g;" \ -e "s,@@VERSION@@,${VERSION},g;" \ -e "s,@@DATE@@,${DATE},g;" \ - -e "s,@@LOCAL@@,${LOCAL_set},g;" \ Makefile.in >Makefile cat <<__EOF__