summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarri Devender Rao <devenrao@in.ibm.com>2017-10-12 23:55:08 -0500
committerMarri Devender Rao <devenrao@in.ibm.com>2017-10-13 00:03:39 -0500
commitb0562c48b100bd6478d2d3ce5579d4f7bc7ea168 (patch)
treed2b32026b14598f21cf6164d871e04677f743a7e
parentbd68273d23648f912367c018160c5a84d5cae3e2 (diff)
downloadphosphor-logging-b0562c48b100bd6478d2d3ce5579d4f7bc7ea168.tar.gz
phosphor-logging-b0562c48b100bd6478d2d3ce5579d4f7bc7ea168.zip
Remove conditional check to export parser and mako script
As part of the CI build noticed elog parser and mako script are not exported becuse of conditional check in the Makefile. Removed conditional check so that files are exported all the time. Conditional check works for bitbake build as the conditional value is set for native recipe build. Change-Id: I65a020757b7176e299af70a8ba9a647b415891be Signed-off-by: Marri Devender Rao <devenrao@in.ibm.com>
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac4
2 files changed, 2 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index dad2319..4035edc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-# For target build
if !INSTALL_SCRIPTS
# export these headers
nobase_include_HEADERS = \
@@ -110,11 +109,9 @@ pkgconfiglibdir = ${libdir}/pkgconfig
pkgconfiglib_DATA = phosphor-logging.pc
SUBDIRS = test
-else
-# For native build
+endif
# Export elog-gen parser and mako script
elogdir = ${datadir}/phosphor-logging/elog
nobase_elog_DATA = \
tools/elog-gen.py \
tools/phosphor-logging/templates/elog-gen-template.mako.hpp
-endif
diff --git a/configure.ac b/configure.ac
index 1f8cad4..b73f2ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,9 +13,7 @@ AC_PROG_MAKE_SET
AC_PROG_MKDIR_P
AC_CHECK_PROG([DIRNAME], dirname, dirname)
-# Check for compiler, packages only during target build.
-# As the packages are not available on the host do not
-# perform checks during native build.
+# Check for compiler, packages only when install_scripts flag is disabled.
AC_ARG_ENABLE([install_scripts],
AS_HELP_STRING([--enable-install_scripts],
[Enable installing parser and mako script]),
OpenPOWER on IntegriCloud