From a591aea25d75438effb59f89546d45fb1373ef2b Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Fri, 24 Feb 2017 10:35:21 +0100 Subject: [PATCH] Put back usage of $GAMMALIB in setup script (#1929) --- src/gammalib-setup.in | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/gammalib-setup.in b/src/gammalib-setup.in index 2a32a9f..c36c73e 100644 --- a/src/gammalib-setup.in +++ b/src/gammalib-setup.in @@ -26,23 +26,23 @@ fi # # Set parameters # ============== -prefix="@prefix@" -exec_prefix="@exec_prefix@" -gammalib_bin="@bindir@" -gammalib_lib="@libdir@@TEST_ENV_DIR@" -python_dir="@pythondir@" -python_exec_dir="@pyexecdir@" -pkgconfig_dir="@libdir@/pkgconfig" -man_dir="@datadir@/doc/gammalib/man" -caldb_dir="@datadir@/caldb" -#prefix="$GAMMALIB" -#gammalib_bin="$GAMMALIB/bin" -#gammalib_lib="$GAMMALIB/lib@TEST_ENV_DIR@" +#prefix="@prefix@" +#exec_prefix="@exec_prefix@" +#gammalib_bin="@bindir@" +#gammalib_lib="@libdir@@TEST_ENV_DIR@" #python_dir="@pythondir@" #python_exec_dir="@pyexecdir@" -#pkgconfig_dir="$GAMMALIB/lib/pkgconfig" -#man_dir="$GAMMALIB/share/doc/gammalib/man" -#caldb_dir="$GAMMALIB/share/caldb" +#pkgconfig_dir="@libdir@/pkgconfig" +#man_dir="@datadir@/doc/gammalib/man" +#caldb_dir="@datadir@/caldb" +prefix="$GAMMALIB" +gammalib_bin="$GAMMALIB/bin" +gammalib_lib="$GAMMALIB/lib@TEST_ENV_DIR@" +python_dir="@pythondir@" +python_exec_dir="@pyexecdir@" +pkgconfig_dir="$GAMMALIB/lib/pkgconfig" +man_dir="$GAMMALIB/share/doc/gammalib/man" +caldb_dir="$GAMMALIB/share/caldb" uname_system=`uname` # -- libgit2 0.21.4