From 6c6415a101488242627360368705449291428dd9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Thu, 10 Dec 2009 15:09:13 +0100 Subject: configure: install in a sub-dir of --libdir and --docdir In case the user specifies the LIBDIR with --libdir , or DOCDIR with --docdir, install our support files in a sub-dir, so as not to mangle existing (potentially system) files/dirs. diff --git a/configure b/configure index 672b041..78a4724 100755 --- a/configure +++ b/configure @@ -404,10 +404,17 @@ echo "${VERSION}" # Now we have the version string, we can build up the paths [ -z "${BINDIR_set}" ] && BINDIR="${PREFIX}/bin" -[ -z "${LIBDIR_set}" ] && LIBDIR="${PREFIX}/lib/ct-ng-${VERSION}" -[ -z "${DOCDIR_set}" ] && DOCDIR="${PREFIX}/share/doc/ct-ng-${VERSION}" +[ -z "${LIBDIR_set}" ] && LIBDIR="${PREFIX}/lib" +[ -z "${DOCDIR_set}" ] && DOCDIR="${PREFIX}/share/doc" [ -z "${MANDIR_set}" ] && MANDIR="${PREFIX}/share/man/man1" +# Install support files in our own sub-dir, so as not to mangle (system) +# files and dirs, but only if not --local +if [ -z "${LOCAL_set}" ]; then + LIBDIR="${LIBDIR}/ct-ng-${VERSION}" + DOCDIR="${DOCDIR}/ct-ng-${VERSION}" +fi + # Check that install PATHs are absolute for p in BIN LIB DOC MAN; do var="${p}DIR" -- cgit v0.10.2-6-g49f6