From 06fdcf51b9e82e9ed072f3999a8e044c3601e4e6 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Mon, 8 Feb 2021 07:52:30 +0100
Subject: [PATCH] configure: revert to using GNU defaults, update summary

- Changing the GNU defaults is messy.  The best way is to leave them
  alone and let the user set their install locations themselves.
- Show --exec-prefix in config Summary, that's where the binaries go

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 configure.ac            | 4 +---
 contrib/alpine/build.sh | 2 +-
 contrib/debian/build.sh | 2 +-
 contrib/void/build.sh   | 2 +-
 doc/build.md            | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 465f75d9..d0b04983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,6 @@ AC_CONFIG_FILES([Makefile
 #m4_include([m4/expand.m4])
 AC_CONFIG_MACRO_DIR([m4])
 
-# Change default prefix, we're PID 1 after all ...
-AC_PREFIX_DEFAULT([])
-
 # Handle building plugins either as dynamically loadable, or built-in
 LT_INIT([shared disable-static dlopen aix-soname=both disable-fast-install])
 
@@ -271,6 +268,7 @@ cat <<EOF
 ------------------ Summary ------------------
  $PACKAGE_NAME version $PACKAGE_VERSION
   Prefix................: $prefix
+  Exec prefix...........: $eprefix
   Sysconfdir............: `eval echo $sysconfdir`
   Localstatedir.........: `eval echo $localstatedir`
   FIFO path.............: $fifo_path
diff --git a/contrib/alpine/build.sh b/contrib/alpine/build.sh
index 8905ad84..47a7a7c1 100755
--- a/contrib/alpine/build.sh
+++ b/contrib/alpine/build.sh
@@ -14,7 +14,7 @@ fi
 # The plugins are optional, but you may need D-Bus and X11 if you want
 # to run X-Window, the other configure flags are however required.
 PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig ./configure	\
-		                               --enable-progress		\
+		 --prefix=/usr --exec-prefix=  --enable-progress		\
                  --enable-dbus-plugin          --enable-x11-common-plugin	\
 		 --enable-alsa-utils-plugin    --enable-inetd-echo-plugin	\
 		 --enable-inetd-chargen-plugin --enable-inetd-daytime-plugin	\
diff --git a/contrib/debian/build.sh b/contrib/debian/build.sh
index b3e75afa..4ecf7205 100755
--- a/contrib/debian/build.sh
+++ b/contrib/debian/build.sh
@@ -22,7 +22,7 @@ echo
 # The plugins are optional, but you may need D-Bus and X11 if you want
 # to run X-Window, the other configure flags are however required.
 ./configure									\
-                                      --enable-progress				\
+    --prefix=/usr --exec-prefix=      --enable-progress				\
     --enable-dbus-plugin              --enable-x11-common-plugin		\
     --enable-alsa-utils-plugin        --enable-inetd-echo-plugin		\
     --enable-inetd-chargen-plugin     --enable-inetd-daytime-plugin		\
diff --git a/contrib/void/build.sh b/contrib/void/build.sh
index 9baa2c37..47be88dd 100755
--- a/contrib/void/build.sh
+++ b/contrib/void/build.sh
@@ -14,7 +14,7 @@ fi
 # The plugins are optional, but you may need D-Bus and X11 if you want
 # to run X-Window, the other configure flags are however required.
 PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig ./configure	\
-		                               --enable-progress		\
+		 --prefix=/usr --exec-prefix=  --enable-progress		\
                  --enable-dbus-plugin          --enable-x11-common-plugin	\
 		 --enable-alsa-utils-plugin    --enable-inetd-echo-plugin	\
 		 --enable-inetd-chargen-plugin --enable-inetd-daytime-plugin	\
diff --git a/doc/build.md b/doc/build.md
index 69661126..8edb831e 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -68,7 +68,7 @@ First, unpack the archive:
 Then configure, build and install:
 
 ```shell
-    $ ./configure                               --enable-inetd-echo-plugin        \
+    $ ./configure --prefix=/usr --exec-prefix=  --enable-inetd-echo-plugin        \
                   --enable-inetd-chargen-plugin --enable-inetd-daytime-plugin     \
                   --enable-inetd-discard-plugin --enable-inetd-time-plugin        \
                   --with-heading="Alpine Linux 3.4" --with-hostname=alpine