diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | ct-ng.in | 7 |
3 files changed, 5 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index 06c90cf..2e98016 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,6 @@ do_subst = ( @SED@ \ -e 's,[@]docdir[@],$(docdir),g' \ -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ -e 's,[@]pkglibexecdir[@],$(pkglibexecdir),g' \ - -e 's,[@]enable_local[@],$(enable_local),g' \ | $(SHELL) config.status --file=- ) ct-ng: ct-ng.in Makefile diff --git a/configure.ac b/configure.ac index c431f69..51e582e 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_ARG_ENABLE( [local], [AS_HELP_STRING( [--enable-local], - [do not install, and use current directory])]) + [run ct-ng from the current directory; 'make install' unsupported])]) AC_SUBST([enable_local], [${enable_local:-no}]) # FIXME: I don't know why we have this. Will remove after the 1.24 release. @@ -279,22 +279,6 @@ AS_IF( [test -f version.sh -a -x version.sh], [PACKAGE_VERSION=$(./version.sh "${PACKAGE_VERSION}")]) -# We are not installing dynamic libraries that need to be found by dynamic linker. -# Install into a subdirectory. -libdir=${libdir}/${PACKAGE_TARNAME} - -# Handle the local case -AS_IF( - [test "x$enable_local" = "xyes"], - [AC_MSG_NOTICE([overiding all of --prefix and the likes, because --enable-local was set]) - prefix=$(pwd) - exec_prefix="$prefix" - bindir="$prefix" - docdir="$prefix""/docs" - pkgdatadir="$prefix" - pkglibexecdir="$prefix/kconfig" - mandir="$docdir"]) - AC_CONFIG_FILES([ Makefile paths.sh @@ -14,18 +14,19 @@ export CT_NG:=$(abspath $(lastword $(MAKEFILE_LIST))) # and this is where we're working in: export CT_TOP_DIR:=$(shell pwd) -# Paths and values set by ./configure -# Don't bother to change it other than with a new ./configure! ifeq (@enable_local@,yes) # automake does not allow to set pkgxxxdir, they are always derived from # a respective xxxdir. So, for enable-local case, set them directly here. export CT_LIB_DIR:=$(CT_TOP_DIR) export CT_LIBEXEC_DIR:=$(CT_TOP_DIR)/kconfig +export CT_DOC_DIR:=$(CT_TOP_DIR)/docs else +# Paths and values set by ./configure +# Don't bother to change it other than with a new ./configure! export CT_LIB_DIR:=@pkgdatadir@ export CT_LIBEXEC_DIR:=@pkglibexecdir@ -endif export CT_DOC_DIR:=@docdir@ +endif # This is crosstool-NG version string export CT_VERSION:=@PACKAGE_VERSION@ |