From d401afbddaae56093cce388e62f7ba4d9d68a327 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 5 Oct 2017 00:09:22 -0700 Subject: Get rid of sub{lib,doc}dir They don't make sense - using same ct-ng won't work with different versions, so they cannot coexist in the same prefix. Also localize other configure variables so that their usage is easier to track. Signed-off-by: Alexey Neyman --- configure.ac | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8fa0e33f..72198d1e 100644 --- a/configure.ac +++ b/configure.ac @@ -301,9 +301,11 @@ 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 -AC_SUBST([sublibdir]) -AC_SUBST([subdocdir]) AS_IF( [test "x$enable_local" = "xyes"], [AC_MSG_NOTICE([overiding all of --prefix and the likes, because --enable-local was set]) @@ -311,13 +313,9 @@ AS_IF( exec_prefix="$prefix" bindir="$prefix" libdir="$prefix" - sublibdir="" docdir="$prefix""/docs" - subdocdir="" datarootdir="$prefix" - mandir="$docdir"], - [sublibdir="/\${VERSION}" - subdocdir="/\${VERSION}"]) + mandir="$docdir"]) AC_CONFIG_FILES([ Makefile -- cgit v1.2.3