Move qfcc's libs and headers to ${prefix}/share

On discussion with Despair, share makes more sense than lib as they are
really cross-platform (though qfcc itself is not).
This commit is contained in:
Bill Currie 2012-05-05 19:34:35 +09:00
parent 9b07f9adcd
commit 95a06c20b2
6 changed files with 10 additions and 10 deletions

View file

@ -38,9 +38,9 @@ AC_DEFINE_UNQUOTED(PATH_SEPARATOR, '/',
[Define this to your operating system path separator character]) [Define this to your operating system path separator character])
AC_DEFINE_UNQUOTED(CPP_NAME, "$CPP_NAME", AC_DEFINE_UNQUOTED(CPP_NAME, "$CPP_NAME",
[Define this to the command line for the C preprocessor]) [Define this to the command line for the C preprocessor])
eval expanded_libdir="${libdir}" eval expanded_datarootdir="${datarootdir}"
eval expanded_libdir="${expanded_libdir}" eval expanded_datarootdir="${expanded_datarootdir}"
AC_DEFINE_UNQUOTED(QFCC_INCLUDE_PATH, "${expanded_libdir}/qfcc/include", AC_DEFINE_UNQUOTED(QFCC_INCLUDE_PATH, "${expanded_datarootdir}/qfcc/include",
[Define this to where qfcc should look for header files]) [Define this to where qfcc should look for header files])
AC_DEFINE_UNQUOTED(QFCC_LIB_PATH, "${expanded_libdir}/qfcc/lib", AC_DEFINE_UNQUOTED(QFCC_LIB_PATH, "${expanded_datarootdir}/qfcc/lib",
[Define this to where qfcc should look for lib files]) [Define this to where qfcc should look for lib files])

View file

@ -1,7 +1,7 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@/qfcc/lib libdir=@datarootdir@/qfcc/lib
includedir=@libdir@/qfcc/include includedir=@datarootdir@/qfcc/include
Name: qfcc Name: qfcc
Description: Ruamoko/QuakeC compiler/linker Description: Ruamoko/QuakeC compiler/linker

View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign AUTOMAKE_OPTIONS= foreign
pkglibdir=$(libdir)/qfcc/lib pkglibdir=$(datarootdir)/qfcc/lib
QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
QCFLAGS=-qq -g -Werror -Wall -Wno-integer-divide --no-default-paths QCFLAGS=-qq -g -Werror -Wall -Wno-integer-divide --no-default-paths

View file

@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS= foreign AUTOMAKE_OPTIONS= foreign
pkgincludedir= $(libdir)/qfcc/include pkgincludedir= $(datarootdir)/qfcc/include
nobase_pkginclude_HEADERS= \ nobase_pkginclude_HEADERS= \
crudefile.h debug.h entities.h infokey.h math.h message.h nq_message.h \ crudefile.h debug.h entities.h infokey.h math.h message.h nq_message.h \
physics.h msgbuf.h qfile.h qfs.h qw_message.h qw_physics.h qw_sys.h \ physics.h msgbuf.h qfile.h qfs.h qw_message.h qw_physics.h qw_sys.h \

View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign AUTOMAKE_OPTIONS= foreign
pkglibdir=$(libdir)/qfcc/lib pkglibdir=$(datarootdir)/qfcc/lib
QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
QCFLAGS=-qq -g -Wall -Wno-integer-divide -Werror --no-default-paths QCFLAGS=-qq -g -Wall -Wno-integer-divide -Werror --no-default-paths

View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign AUTOMAKE_OPTIONS= foreign
pkglibdir=$(libdir)/qfcc/lib pkglibdir=$(datarootdir)/qfcc/lib
QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
QFCC=$(QFCC_DEP) QFCC=$(QFCC_DEP)