From: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
---
/** Email created from pull request 213 (lumag:plat-def)
** https://github.com/Linaro/odp/pull/213
** Patch: https://github.com/Linaro/odp/pull/213.patch
** Base sha: a63f25ff2994b2df78c24f1f8b63d0e06628eb68
** Merge commit sha: d50e2e291ff11c1319e66c699d2f82260d59c383
**/
configure.ac | 4 +---
helper/Makefile.am | 2 +-
{pkgconfig => helper}/libodphelper.pc.in | 0
helper/m4/configure.m4 | 3 ++-
4 files changed, 4 insertions(+), 5 deletions(-)
rename {pkgconfig => helper}/libodphelper.pc.in (100%)
diff --git a/configure.ac b/configure.ac
index 600f52bc9..87362bd41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -352,9 +352,7 @@ esac
CFLAGS="$CFLAGS $ODP_CFLAGS"
CXXFLAGS="$CXXFLAGS $ODP_CXXFLAGS"
-AC_CONFIG_FILES([Makefile
- pkgconfig/libodphelper.pc
- ])
+AC_CONFIG_FILES([Makefile])
##########################################################################
# distribute the changed variables among the Makefiles
diff --git a/helper/Makefile.am b/helper/Makefile.am
index bf75b467e..c668386d9 100644
--- a/helper/Makefile.am
+++ b/helper/Makefile.am
@@ -1,5 +1,5 @@
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc
+pkgconfig_DATA = libodphelper.pc
LIB = $(top_builddir)/lib
AM_CPPFLAGS = -I$(srcdir)/include
diff --git a/pkgconfig/libodphelper.pc.in b/helper/libodphelper.pc.in
similarity index 100%
rename from pkgconfig/libodphelper.pc.in
rename to helper/libodphelper.pc.in
diff --git a/helper/m4/configure.m4 b/helper/m4/configure.m4
index 2e2943d14..3a867e8cb 100644
--- a/helper/m4/configure.m4
+++ b/helper/m4/configure.m4
@@ -19,4 +19,5 @@ AC_ARG_ENABLE([helper-linux],
fi])
AC_CONFIG_FILES([helper/Makefile
- helper/test/Makefile])
+ helper/libodphelper.pc
+ helper/test/Makefile])
