diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-06-06 11:43:15 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-06-06 11:43:15 +0000 |
commit | eeb1c18455a42ef929933c981ea6bbd8b21875e4 (patch) | |
tree | 70a7c099e1ed018c9b8056afce0681c1b5796075 /Build/source | |
parent | 7eb92b4542d607944e336b3bc75835a2b91a4e15 (diff) |
lcdf-typetools/otftotfm: SHAREDIR for native vs non-native build
git-svn-id: svn://tug.org/texlive/trunk@22822 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rwxr-xr-x | Build/source/texk/lcdf-typetools/configure | 9 | ||||
-rw-r--r-- | Build/source/texk/lcdf-typetools/configure.ac | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index bb55713ccb2..a2b2a1ce455 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -19827,9 +19827,16 @@ shell_expand () { test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +shell_expand datadir + +if test "x$enable_native_texlive_build" = xyes; then + sharedir=/nonesuch +else + sharedir=$datadir/lcdf-typetools +fi cat >>confdefs.h <<_ACEOF -#define SHAREDIR "/nonesuch" +#define SHAREDIR "$sharedir" _ACEOF diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac index 6224717dc85..38678afc7a6 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac +++ b/Build/source/texk/lcdf-typetools/configure.ac @@ -331,7 +331,14 @@ dnl Preset $prefix and $exec_prefix. test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -AC_DEFINE_UNQUOTED(SHAREDIR, "/nonesuch", [Data directory.]) +shell_expand datadir + +if test "x$enable_native_texlive_build" = xyes; then + sharedir=/nonesuch +else + sharedir=$datadir/lcdf-typetools +fi +AC_DEFINE_UNQUOTED(SHAREDIR, "$sharedir", [Data directory.]) dnl |