thunk_gen pkgconf API changed

dosemu2 · Feb 16, 2024 · 1761222 · 1761222
1 parent c2a8ea0
commit 1761222
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/fdpp/makefile b/fdpp/makefile
@@ -32,12 +32,13 @@ FD_EXT_H = $(TOP)/include/fdpp
 EXT_H = $(FD_EXT_H)/thunks.h $(FD_EXT_H)/bprm.h $(FD_EXT_H)/memtype.h \
      $(FD_EXT_H)/loader.h
 GEN_EXT = fdpp.pc
-TGD = $(shell pkg-config --variable=bindir thunk_gen)
-ifeq ($(TGD),)
+TG = $(shell pkg-config --variable=binary thunk_gen)
+ifeq ($(TG),)
+ifeq ($(filter clean,$(MAKECMDGOALS)),)
 $(error thunk_gen not installed)
 endif
-TGS = $(TGD)/tg_m4
-TG = $(TGD)/thunk_gen
+endif
+TGS = $(shell pkg-config --variable=tgscript thunk_gen)
 TGM4 = $(shell pkg-config --variable=m4script thunk_gen)
 TFLAGS = -a 2 -p 2
 

diff --git a/fdpp/meson.build b/fdpp/meson.build
@@ -5,8 +5,8 @@ MA = meson.current_source_dir() / 'parsers/mkasmdefs.sh'
 PD = meson.current_source_dir() / 'parsers/parse_decls.sh'
 M4 = meson.current_source_dir() / 'parsers/thunks.m4'
 tg = dependency('thunk_gen')
-TG = tg.get_pkgconfig_variable('bindir') / 'thunk_gen'
-TGS = tg.get_pkgconfig_variable('bindir') / 'tg_m4'
+TG = tg.get_pkgconfig_variable('binary')
+TGS = tg.get_pkgconfig_variable('tgscript')
 TGM4 = tg.get_pkgconfig_variable('m4script')
 TFLAGS = ['-a', '2', '-p', '2']
 SRC = 'src'