Restore --enable-local use

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2018-03-18 14:41:30 -07:00
parent bc542408ca
commit f45e29c5ca
3 changed files with 10 additions and 4 deletions

View File

@ -13,11 +13,10 @@ EXTRA_DIST = ct-ng.in bootstrap
nobase_dist_pkgdata_DATA = $(verbatim_data) paths.sh
do_subst = ( @SED@ \
-e 's,[@]bindir[@],$(bindir),g' \
-e 's,[@]docdir[@],$(docdir),g' \
-e 's,[@]mandir[@],$(mandir),g' \
-e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
-e 's,[@]pkglibexecdir[@],$(pkglibexecdir),g' \
-e 's,[@]enable_local[@],$(enable_local),g' \
| $(SHELL) config.status --file=- )
ct-ng: ct-ng.in Makefile

View File

@ -290,9 +290,9 @@ AS_IF(
prefix=$(pwd)
exec_prefix="$prefix"
bindir="$prefix"
libdir="$prefix"
docdir="$prefix""/docs"
datarootdir="$prefix"
pkgdatadir="$prefix"
pkglibexecdir="$prefix/kconfig"
mandir="$docdir"])
AC_CONFIG_FILES([

View File

@ -16,8 +16,15 @@ export CT_TOP_DIR:=$(shell pwd)
# Paths and values set by ./configure
# Don't bother to change it other than with a new ./configure!
ifeq (@enable_local@,yes)
# automake does not allow to set pkgxxxdir, they are always derived from
# a respective xxxdir. So, for enable-local case, set them directly here.
export CT_LIB_DIR:=$(CT_TOP_DIR)
export CT_LIBEXEC_DIR:=$(CT_TOP_DIR)/kconfig
else
export CT_LIB_DIR:=@pkgdatadir@
export CT_LIBEXEC_DIR:=@pkglibexecdir@
endif
export CT_DOC_DIR:=@docdir@
# This is crosstool-NG version string