Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

fix: fix a few build/installation problems related to murphy-db. #20

Open
klihub wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: fix a few build/installation problems related to murphy-db. #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbb21b2
build-sys: install murphy-db headers only once, to the correct place.
klihub Jan 22, 2018
18a720a
murphy-db: fix {include,lib}dir.
klihub Jan 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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
#
Expand Down
6 changes: 3 additions & 3 deletions src/murphy-db/murphy-db.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down