From 355f6f03fba92c71f9ff8d2e26985d2c1b7a0a0b Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sun, 18 Mar 2018 23:40:28 -0700
Subject: [PATCH] Cannot ignore 'make install' with automake

Automake does not allow us to place the hooks before its generated actions,
and does not allow us to check MAKECMDGOALS, and does not support a mechanism
for disabling make install (such as noinst_SUBDIRS, requested a few times
on automake mailing list). The only way I could preserve the current behavior
is to have a GNUmakefile wrapper that will convert MAKECMDGOAL into a variable
unknown to automake - which seems too convoluted a solution for the problem
being solved.

Hence the approach is to not override anything for --enable-local. It is now
fully handled by selecting different values for CT_xxx_DIR in ct-ng.in; but
at the build-system level, all the variables remain the same. We just don't
support 'make install' in that case anymore; but the ct-ng in the working
copy can be used after a regular 'make' (or 'make all').

Help message for --enable-local updated accordingly.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 Makefile.am  |  1 -
 configure.ac | 18 +-----------------
 ct-ng.in     |  7 ++++---
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 06c90cfc..2e98016e 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 c431f697..51e582e3 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
diff --git a/ct-ng.in b/ct-ng.in
index 03925f97..926ba710 100644
--- a/ct-ng.in
+++ b/ct-ng.in
@@ -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@