From bf51ce812c5ee274174262ca80bc26e3feacee7a Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sat, 17 Aug 2024 00:33:22 +0000 Subject: [PATCH] Include includedir in .oc file FossilOrigin-Name: 7c54d67cf30ec374b8f855873ce30d488dd86160bc366ff2c44f3dacf18e00ca --- ObjPgSQL.oc.in | 2 +- meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ObjPgSQL.oc.in b/ObjPgSQL.oc.in index 40bb5e7..b5c760d 100644 --- a/ObjPgSQL.oc.in +++ b/ObjPgSQL.oc.in @@ -1,5 +1,5 @@ package_format 1 -CPPFLAGS="$CPPFLAGS @LIBPQ_CPPFLAGS@" +CPPFLAGS="$CPPFLAGS -I@includedir@ @LIBPQ_CPPFLAGS@" LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $LIBS" FRAMEWORK_LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $FRAMEWORK_LIBS" STATIC_LIBS="@libdir@/libobjpgsql.a @LIBPQ_LIBS@ $STATIC_LIBS" diff --git a/meson.build b/meson.build index ee2c9bd..e3c3ee1 100644 --- a/meson.build +++ b/meson.build @@ -31,6 +31,7 @@ configure_file( input: 'ObjPgSQL.oc.in', output: 'ObjPgSQL.oc', configuration: { + 'includedir': get_option('prefix') / get_option('includedir'), 'libdir': get_option('prefix') / get_option('libdir'), 'LIBPQ_CPPFLAGS': libpq_cflags, 'LIBPQ_LIBS': libpq_libs,