From 5b95b81ea90682c124d5280b64a91a249c464ee4 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sat, 17 Mar 2018 17:41:36 -0700
Subject: [PATCH] Kill gperf vestiges

Generate paths.sh by configure, do away with paths.mk.

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 .gitignore     |  2 +-
 .travis.yml    |  1 -
 bootstrap      |  6 ++++++
 configure.ac   |  1 +
 ct-ng.in       | 13 ++++++++++++-
 debian/control |  2 +-
 paths.sh.in    | 12 ++++++++++++
 7 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 paths.sh.in

diff --git a/.gitignore b/.gitignore
index 0d917b80..0f5d8a9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ Makefile.in
 ct-ng
 !ct-ng.comp
 !ct-ng.in
-paths.*
+paths.sh
 config/configure.in
 config/gen/
 config/versions/
diff --git a/.travis.yml b/.travis.yml
index 1be7a570..aa56c43f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,6 @@ addons:
         packages:
             - bison
             - flex
-            - gperf
             - libncurses5-dev
             - texinfo
             - help2man
diff --git a/bootstrap b/bootstrap
index e3884204..5c6eacaa 100755
--- a/bootstrap
+++ b/bootstrap
@@ -740,6 +740,7 @@ gen_selection menu comp_libs "Companion libraries"
 
 msg "*** Gathering the list of data files to install"
 {
+    declare -A seen_files
     echo -n "verbatim_data ="
     find config contrib packages samples scripts -type f | LANG=C sort | while read f; do
         case "${f}" in
@@ -754,8 +755,13 @@ msg "*** Gathering the list of data files to install"
                 f=config/configure.in
                 ;;
         esac
+        # Checks & substitutions above may result in duplicate files
+        if [ -n "${seen_files[${f}]}" ]; then
+            continue
+        fi
         echo " \\"
         echo -n "	${f}"
+        seen_files[${f}]=y
     done
 } > verbatim-data.mk
 
diff --git a/configure.ac b/configure.ac
index 20d5b42f..5e9fb182 100644
--- a/configure.ac
+++ b/configure.ac
@@ -297,6 +297,7 @@ AS_IF(
 
 AC_CONFIG_FILES([
     Makefile
+    paths.sh
     kconfig/Makefile
     config/configure.in
 ])
diff --git a/ct-ng.in b/ct-ng.in
index 0b1e47d4..10ee237b 100644
--- a/ct-ng.in
+++ b/ct-ng.in
@@ -27,7 +27,18 @@ CT_WGET     := @wget@
 CT_CURL     := @curl@
 
 # Paths found by ./configure
-include $(CT_LIB_DIR)/paths.mk
+export install      = @INSTALL@
+export bash         = @BASH_SHELL@
+export awk          = @AWK@
+export grep         = @GREP@
+export make         = @MAKE@
+export sed          = @SED@
+export libtool      = @LIBTOOL@
+export libtoolize   = @LIBTOOLIZE@
+export objcopy      = @OBJCOPY@
+export objdump      = @OBJDUMP@
+export readelf      = @READELF@
+export patch        = @PATCH@
 
 # Some distributions (eg. Ubuntu) thought it wise to point /bin/sh to
 # a truly POSIX-conforming shell, ash in this case. This is not so good
diff --git a/debian/control b/debian/control
index f6e7eea8..4c2a95e6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Multiple Candidates <open@example.com>
 Build-Depends: debhelper (>= 9), autoconf, automake, autotools-dev,
- libncursesw5-dev, libncurses5-dev, gperf, bison, flex,
+ libncursesw5-dev, libncurses5-dev, bison, flex,
  texinfo, help2man, gawk, git, subversion, bzip2, libtool-bin
 Standards-Version: 3.9.8
 Homepage: http://crosstool-ng.org/
diff --git a/paths.sh.in b/paths.sh.in
new file mode 100644
index 00000000..c1ba0bdd
--- /dev/null
+++ b/paths.sh.in
@@ -0,0 +1,12 @@
+export install="@INSTALL@"
+export bash="@BASH_SHELL@"
+export awk="@AWK@"
+export grep="@GREP@"
+export make="@MAKE@"
+export sed="@SED@"
+export libtool="@LIBTOOL@"
+export libtoolize="@LIBTOOLIZE@"
+export objcopy="@OBJCOPY@"
+export objdump="@OBJDUMP@"
+export readelf="@READELF@"
+export patch="@PATCH@"