From 95a06c20b23469119a4e09982d010cce7c6fd5bb Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 5 May 2012 19:34:35 +0900 Subject: [PATCH] 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). --- config.d/qfcc.m4 | 8 ++++---- pkg-config/qfcc.pc.in | 4 ++-- ruamoko/gui/Makefile.am | 2 +- ruamoko/include/Makefile.am | 2 +- ruamoko/lib/Makefile.am | 2 +- ruamoko/scheme/Makefile.am | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config.d/qfcc.m4 b/config.d/qfcc.m4 index 56ec20070..3e1d87ae7 100644 --- a/config.d/qfcc.m4 +++ b/config.d/qfcc.m4 @@ -38,9 +38,9 @@ AC_DEFINE_UNQUOTED(PATH_SEPARATOR, '/', [Define this to your operating system path separator character]) AC_DEFINE_UNQUOTED(CPP_NAME, "$CPP_NAME", [Define this to the command line for the C preprocessor]) -eval expanded_libdir="${libdir}" -eval expanded_libdir="${expanded_libdir}" -AC_DEFINE_UNQUOTED(QFCC_INCLUDE_PATH, "${expanded_libdir}/qfcc/include", +eval expanded_datarootdir="${datarootdir}" +eval expanded_datarootdir="${expanded_datarootdir}" +AC_DEFINE_UNQUOTED(QFCC_INCLUDE_PATH, "${expanded_datarootdir}/qfcc/include", [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]) diff --git a/pkg-config/qfcc.pc.in b/pkg-config/qfcc.pc.in index 85290c34f..206fc0f1a 100644 --- a/pkg-config/qfcc.pc.in +++ b/pkg-config/qfcc.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@/qfcc/lib -includedir=@libdir@/qfcc/include +libdir=@datarootdir@/qfcc/lib +includedir=@datarootdir@/qfcc/include Name: qfcc Description: Ruamoko/QuakeC compiler/linker diff --git a/ruamoko/gui/Makefile.am b/ruamoko/gui/Makefile.am index c8fb007bd..f52aacaf0 100644 --- a/ruamoko/gui/Makefile.am +++ b/ruamoko/gui/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS= foreign -pkglibdir=$(libdir)/qfcc/lib +pkglibdir=$(datarootdir)/qfcc/lib QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) QCFLAGS=-qq -g -Werror -Wall -Wno-integer-divide --no-default-paths diff --git a/ruamoko/include/Makefile.am b/ruamoko/include/Makefile.am index e2bc9e076..d4f63d2a8 100644 --- a/ruamoko/include/Makefile.am +++ b/ruamoko/include/Makefile.am @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS= foreign -pkgincludedir= $(libdir)/qfcc/include +pkgincludedir= $(datarootdir)/qfcc/include nobase_pkginclude_HEADERS= \ 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 \ diff --git a/ruamoko/lib/Makefile.am b/ruamoko/lib/Makefile.am index 0d5533bdd..983f2b644 100644 --- a/ruamoko/lib/Makefile.am +++ b/ruamoko/lib/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS= foreign -pkglibdir=$(libdir)/qfcc/lib +pkglibdir=$(datarootdir)/qfcc/lib QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) QCFLAGS=-qq -g -Wall -Wno-integer-divide -Werror --no-default-paths diff --git a/ruamoko/scheme/Makefile.am b/ruamoko/scheme/Makefile.am index 7185a199b..f55550c61 100644 --- a/ruamoko/scheme/Makefile.am +++ b/ruamoko/scheme/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS= foreign -pkglibdir=$(libdir)/qfcc/lib +pkglibdir=$(datarootdir)/qfcc/lib QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT) QFCC=$(QFCC_DEP)