Commit 32b2c065e26839db5fbe6e8ada6406906f7fe854
1 parent
3cf333d8
ctools-setup script now depends on $CTOOLS environment variable (#1929)
Showing
1 changed file
with
14 additions
and
7 deletions
src/ctools-setup.in
| @@ -27,16 +27,23 @@ fi | @@ -27,16 +27,23 @@ fi | ||
| 27 | # Set parameters | 27 | # Set parameters |
| 28 | # ============== | 28 | # ============== |
| 29 | #prefix="@prefix@" | 29 | #prefix="@prefix@" |
| 30 | -prefix=$CTOOLS | ||
| 31 | #exec_prefix="@exec_prefix@" | 30 | #exec_prefix="@exec_prefix@" |
| 32 | -ctools_bin="@bindir@" | ||
| 33 | -ctools_lib="@libdir@" | ||
| 34 | -uname_system=`uname` | 31 | +#ctools_bin="@bindir@" |
| 32 | +#ctools_lib="@libdir@" | ||
| 33 | +#python_dir="@pythondir@" | ||
| 34 | +#python_exec_dir="@pyexecdir@" | ||
| 35 | +#pkgconfig_dir="@libdir@/pkgconfig" | ||
| 36 | +#man_dir="@datadir@/doc/ctools/man" | ||
| 37 | +#caldb_dir="@datadir@/caldb" | ||
| 38 | +prefix="$CTOOLS" | ||
| 39 | +ctools_bin="$CTOOLS/bin" | ||
| 40 | +ctools_lib="$CTOOLS/lib" | ||
| 35 | python_dir="@pythondir@" | 41 | python_dir="@pythondir@" |
| 36 | python_exec_dir="@pyexecdir@" | 42 | python_exec_dir="@pyexecdir@" |
| 37 | -pkgconfig_dir="@libdir@/pkgconfig" | ||
| 38 | -man_dir="@datadir@/doc/ctools/man" | ||
| 39 | -caldb_dir="@datadir@/caldb" | 43 | +pkgconfig_dir="$CTOOLS/lib/pkgconfig" |
| 44 | +man_dir="$CTOOLS/share/doc/ctools/man" | ||
| 45 | +caldb_dir="$CTOOLS/share/caldb" | ||
| 46 | +uname_system=`uname` | ||
| 40 | 47 | ||
| 41 | # | 48 | # |
| 42 | # Make pfiles available (this is needed for an installation where the | 49 | # Make pfiles available (this is needed for an installation where the |