From 09e69452a0ef8f5a2b0bb8478f6e4041d9754838 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Fri, 24 Feb 2017 14:40:36 +0100 Subject: [PATCH] Revert to initial setup script (#1929) --- src/ctools-setup.in | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ctools-setup.in b/src/ctools-setup.in index 3f8fb2f..f4359fb 100644 --- a/src/ctools-setup.in +++ b/src/ctools-setup.in @@ -26,15 +26,16 @@ fi # # Set parameters # ============== -prefix="$CTOOLS" -ctools_bin="$CTOOLS/bin" -ctools_lib="$CTOOLS/lib" +prefix="@prefix@" +exec_prefix="@exec_prefix@" +ctools_bin="@bindir@" +ctools_lib="@libdir@" +uname_system=`uname` python_dir="@pythondir@" python_exec_dir="@pyexecdir@" -pkgconfig_dir="$CTOOLS/lib/pkgconfig" -man_dir="$CTOOLS/share/doc/ctools/man" -caldb_dir="$CTOOLS/share/caldb" -uname_system=`uname` +pkgconfig_dir="@libdir@/pkgconfig" +man_dir="@datadir@/doc/ctools/man" +caldb_dir="@datadir@/caldb" # # Make pfiles available (this is needed for an installation where the -- libgit2 0.21.4