summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in18
-rwxr-xr-xconfigure11
2 files changed, 5 insertions, 24 deletions
diff --git a/Makefile.in b/Makefile.in
index a1f9098..3eeef51 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,7 +12,6 @@ LIBDIR := @@LIBDIR@@
DOCDIR := @@DOCDIR@@
MANDIR := @@MANDIR@@
DATE := @@DATE@@
-LOCAL := @@LOCAL@@
MAKE := $(shell which make || type -p make || echo /usr/bin/make)
###############################################################################
@@ -66,19 +65,12 @@ clean-doc:
#--------------------------------------
# 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 @@ install-lib-main: install-local $(LIBDIR)
# 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 --git a/configure b/configure
index 485932d..8e28eb2 100755
--- a/configure
+++ b/configure
@@ -9,7 +9,6 @@ BINDIR_set=
LIBDIR_set=
DOCDIR_set=
MANDIR_set=
-LOCAL_set=
get_optval(){
local ret
@@ -80,7 +79,6 @@ Defaults for the options are specified in brackets.
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 @@ while [ $# -ne 0 ]; do
--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 @@ sed -r -e "s,@@BINDIR@@,${BINDIR},g;" \
-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__