ObjFW/ObjPgSQL
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Include includedir in .oc file

Browse source 
FossilOrigin-Name: 7c54d67cf30ec374b8f855873ce30d488dd86160bc366ff2c44f3dacf18e00ca
This commit is contained in:
Jonathan Schleifer 2024-08-17 00:33:22 +00:00
parent 1344b2a244
commit bf51ce812c
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ObjPgSQL.oc.in
View file

@ -1,5 +1,5 @@
package_format 1 package_format 1
CPPFLAGS="$CPPFLAGS @LIBPQ_CPPFLAGS@" CPPFLAGS="$CPPFLAGS -I@includedir@ @LIBPQ_CPPFLAGS@"
LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $LIBS" LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $LIBS"
FRAMEWORK_LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $FRAMEWORK_LIBS" FRAMEWORK_LIBS="-L@libdir@ -lobjpgsql @LIBPQ_LIBS@ $FRAMEWORK_LIBS"
STATIC_LIBS="@libdir@/libobjpgsql.a @LIBPQ_LIBS@ $STATIC_LIBS" STATIC_LIBS="@libdir@/libobjpgsql.a @LIBPQ_LIBS@ $STATIC_LIBS"

1
meson.build
View file

@ -31,6 +31,7 @@ configure_file(
input: 'ObjPgSQL.oc.in', input: 'ObjPgSQL.oc.in',
output: 'ObjPgSQL.oc', output: 'ObjPgSQL.oc',
configuration: { configuration: {
'includedir': get_option('prefix') / get_option('includedir'),
'libdir': get_option('prefix') / get_option('libdir'), 'libdir': get_option('prefix') / get_option('libdir'),
'LIBPQ_CPPFLAGS': libpq_cflags, 'LIBPQ_CPPFLAGS': libpq_cflags,
'LIBPQ_LIBS': libpq_libs, 'LIBPQ_LIBS': libpq_libs,