From 34c0d626d425cf9e1ec26d18b10f7d763518416e Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sat, 17 Aug 2024 00:32:22 +0000 Subject: [PATCH] Include includedir in .oc file FossilOrigin-Name: 86f27a3ae3ccf895cacdc3043559bc27f7cb08feb6bd7f8b96e688dc71ebab73 --- ObjSQLite3.oc.in | 2 +- meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ObjSQLite3.oc.in b/ObjSQLite3.oc.in index 9843ef3..c667f23 100644 --- a/ObjSQLite3.oc.in +++ b/ObjSQLite3.oc.in @@ -1,5 +1,5 @@ package_format 1 -CPPFLAGS="$CPPFLAGS @SQLITE3_CPPFLAGS@" +CPPFLAGS="$CPPFLAGS -I@includedir@ @SQLITE3_CPPFLAGS@" LIBS="-L@libdir@ -lobjsqlite3 @SQLITE3_LIBS@ $LIBS" FRAMEWORK_LIBS="-L@libdir@ -lobjsqlite3 @SQLITE3_LIBS@ $FRAMEWORK_LIBS" STATIC_LIBS="@libdir@/libobjsqlite3.a @SQLITE3_LIBS@ $STATIC_LIBS" diff --git a/meson.build b/meson.build index d6fef43..3cf88d7 100644 --- a/meson.build +++ b/meson.build @@ -31,6 +31,7 @@ configure_file( input: 'ObjSQLite3.oc.in', output: 'ObjSQLite3.oc', configuration: { + 'includedir': get_option('prefix') / get_option('includedir'), 'libdir': get_option('prefix') / get_option('libdir'), 'SQLITE3_CPPFLAGS': sqlite3_cflags, 'SQLITE3_LIBS': sqlite3_libs,