From dbb21b2c2d6c20c053e09d6faf366f219d193615 Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Mon, 22 Jan 2018 17:42:19 +0200 Subject: [PATCH 1/2] build-sys: install murphy-db headers only once, to the correct place. Signed-off-by: Krisztian Litkey --- src/Makefile.am | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index fb49f88e..10319601 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,7 +36,7 @@ MDB_LINKER_SCRIPT = linker-script.mdb libmdb_la_CFLAGS = $(AM_CFLAGS) libmdb_ladir = \ - murphy-db/include/murphy-db + $(includedir)/murphy-db libmdb_la_HEADERS = \ murphy-db/include/murphy-db/macros.h \ @@ -95,7 +95,7 @@ MQI_LINKER_SCRIPT = linker-script.mqi libmqi_la_CFLAGS = $(AM_CFLAGS) libmqi_ladir = \ - murphy-db/include/murphy-db + $(includedir)/murphy-db libmqi_la_HEADERS = \ murphy-db/include/murphy-db/mqi.h @@ -137,7 +137,7 @@ libmql_la_CFLAGS = $(AM_CFLAGS) \ -I$(top_builddir)/src/murphy-db/mql # generated mql headers libmql_ladir = \ - murphy-db/include/murphy-db + $(includedir)/murphy-db libmql_la_HEADERS = \ murphy-db/include/murphy-db/mql.h \ @@ -247,12 +247,6 @@ clean-local:: rm -f $(CHECK_LIBMDB_LOG) $(CHECK_LIBMQI_LOG) $(CHECK_LIBMQL_LOG) \ $(MURPHY_DB_TESTS) -libmurphydbincludedir = $(includedir)/murphy-db -libmurphydbinclude_HEADERS = \ - $(libmdb_la_HEADERS) \ - $(libmqi_la_HEADERS) \ - $(libmql_la_HEADERS) - ################################### # murphy common library # From 18a720aedb5b77a7cc0b38279db3bd538a592c16 Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Mon, 22 Jan 2018 17:43:03 +0200 Subject: [PATCH 2/2] murphy-db: fix {include,lib}dir. Signed-off-by: Krisztian Litkey --- src/murphy-db/murphy-db.pc.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/murphy-db/murphy-db.pc.in b/src/murphy-db/murphy-db.pc.in index f41cf245..d381a648 100644 --- a/src/murphy-db/murphy-db.pc.in +++ b/src/murphy-db/murphy-db.pc.in @@ -1,11 +1,11 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -includedir=@includedir@/murphy-db -libdir=@libdir@/murphy +includedir=@includedir@ +libdir=@libdir@ Name: Murphy DB Description: Database for the Murphy policy engine -URL: github/otcshare/murphy +URL: http://01.org/murphy/ Version: @PACKAGE_VERSION@ Cflags: -I${includedir} Libs: -L${libdir} -lmqi -lmql -lmdb