summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/texk/lcdf-typetools/configure9
-rw-r--r--Build/source/texk/lcdf-typetools/configure.ac9
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