Francois Brun / ctools

Commit e968706faf5aa0d77512a3edaba523abc1507f34

Authored by knodlseder
1 parent 3ba3b6f3

use general paths and add python_exec_dir

Inline Side-by-side
Showing 1 changed file with 24 additions and 5 deletions
src/ctools-setup.in
  View file @e968706
@@ -27,12 +27,15 @@ fi @@ -27,12 +27,15 @@ fi
27 # Set parameters 27 # Set parameters
28 # ============== 28 # ==============
29 prefix="@prefix@" 29 prefix="@prefix@"
30 -ctools_bin="@prefix@/bin"  
31 -ctools_lib="@prefix@/lib" 30 +exec_prefix="@exec_prefix@"
  31 +ctools_bin="@bindir@"
  32 +ctools_lib="@libdir@"
32 uname_system=`uname` 33 uname_system=`uname`
33 python_dir="@pythondir@" 34 python_dir="@pythondir@"
34 -pkgconfig_dir="@prefix@/lib/pkgconfig"  
35 -man_dir="@prefix@/share/doc/ctools/man" 35 +python_exec_dir="@pyexecdir@"
  36 +pkgconfig_dir="@libdir@/pkgconfig"
  37 +man_dir="@datadir@/doc/ctools/man"
  38 +caldb_dir="@datadir@/caldb"
36 39
37 # 40 #
38 # Make pfiles available (this is needed for an installation where the 41 # Make pfiles available (this is needed for an installation where the
@@ -123,6 +126,13 @@ else @@ -123,6 +126,13 @@ else
123 sed "s%:$python_dir:%:%g" | sed "s%::*$%%"` 126 sed "s%:$python_dir:%:%g" | sed "s%::*$%%"`
124 PYTHONPATH="$python_dir$PYTHONPATH" 127 PYTHONPATH="$python_dir$PYTHONPATH"
125 fi 128 fi
  129 +if [ "x$PYTHONPATH" = x ]; then
  130 + PYTHONPATH="$python_exec_dir"
  131 +else
  132 + PYTHONPATH=`echo ":$PYTHONPATH:" | \
  133 + sed "s%:$python_exec_dir:%:%g" | sed "s%::*$%%"`
  134 + PYTHONPATH="$python_dir$PYTHONPATH"
  135 +fi
126 136
127 # 137 #
128 # Set PKG_CONFIG_PATH 138 # Set PKG_CONFIG_PATH
@@ -158,9 +168,18 @@ else @@ -158,9 +168,18 @@ else
158 fi 168 fi
159 169
160 # 170 #
  171 +# Set CALDB (if not yet set)
  172 +# ==========================
  173 +if [ "x$CALDB" = x ]; then
  174 + CALDB="$caldb_dir"
  175 +fi
  176 +
  177 +#
161 # List of variables needed in initialization script 178 # List of variables needed in initialization script
162 # ================================================= 179 # =================================================
163 -varlist="PATH PYTHONPATH PKG_CONFIG_PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH MANPATH PFILES PFCLOBBER" 180 +varlist="LD_LIBRARY_PATH DYLD_LIBRARY_PATH PATH"
  181 +varlist="$varlist PYTHONPATH PKG_CONFIG_PATH MANPATH"
  182 +varlist="$varlist PFILES PFCLOBBER CALDB"
164 183
165 # 184 #
166 # Save values in output initialization shell scripts 185 # Save values in output initialization shell scripts