[build] Install QF/keys.h into qfcc's include directory

As well as $prefix/include, of course. This fixes the problem with
external ruamoko builds failing due to keys.h and qfcc's "lockdown" on
system headers.
This commit is contained in:
Bill Currie 2020-03-03 22:22:53 +09:00
parent c58cf2c2d0
commit de01cff70e
2 changed files with 18 additions and 1 deletions

View file

@ -254,7 +254,15 @@ QF_PROCESS_NEED_DIRS(ruamoko,[qwaq])
if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then
QF_NEED(top, [ruamoko])
qfcc_include_qf="\$(qfcc_include_qf)"
fi
QF_SUBST(qfcc_include_qf)
if test x"${top_need_libs}" = xyes; then
include_qf="\$(include_qf)"
fi
QF_SUBST(include_qf)
progs_gz=
if test "$HAVE_ZLIB" = "yes"; then
progs_gz=".gz"

View file

@ -1,6 +1,9 @@
AUTOMAKE_OPTIONS = foreign
pkgincludedir = $(includedir)/QF
nobase_pkginclude_HEADERS = \
#for header files that qfcc (ruamoko) will use
pkgdatadir = $(datarootdir)/qfcc/include/QF
include_qf= \
alloc.h bspfile.h cbuf.h cdaudio.h checksum.h clip_hull.h cmd.h \
console.h crc.h csqc.h cvar.h dstring.h draw.h gib.h hash.h \
idparse.h image.h in_event.h info.h input.h iqm.h joystick.h keys.h \
@ -26,3 +29,9 @@ nobase_pkginclude_HEADERS = \
\
plugin/cd.h plugin/console.h plugin/general.h plugin/input.h \
plugin/snd_output.h plugin/snd_render.h plugin/vid_render.h
qfcc_include_qf=keys.h
nobase_pkginclude_HEADERS = @include_qf@
pkgdata_DATA=@qfcc_include_qf@
EXTRA_HEADERS = $(include_qf) $(qfcc_include_qf)