From 14ef710ab415df16dd6c365524b24dd246606565 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 16 Apr 2019 23:21:39 +0200 Subject: [PATCH] acinclude.m4: align to neutrino's acinclude.m4; fix exec_prefix variable in cdk-mode too Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/2315b8a9853808b3955358c1b6c40a2f947f4468 Author: vanhofen Date: 2019-04-16 (Tue, 16 Apr 2019) Origin message was: ------------------ - acinclude.m4: align to neutrino's acinclude.m4; fix exec_prefix variable in cdk-mode too ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 993f5df..be1cc74 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -36,11 +36,9 @@ if test "$TARGET" = "native"; then if test "$prefix" = "NONE"; then prefix=/usr/local fi - TARGET_PREFIX=$prefix - if test "$exec_prefix" = "NONE"; then - exec_prefix=$prefix - fi targetprefix=$prefix + TARGET_PREFIX=$prefix + AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX", [The targets prefix]) elif test "$TARGET" = "cdk"; then AC_MSG_RESULT(cdk) @@ -65,6 +63,10 @@ else AC_MSG_ERROR([invalid target $TARGET, choose on from native,cdk]); fi +if test "$exec_prefix" = "NONE"; then + exec_prefix=$prefix +fi + AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_SYS_LARGEFILE