[Spice-devel] [spice-protocol] build-sys: Use $datadir for .proto files/codegen scripts

Christophe Fergeau cfergeau at redhat.com
Mon Oct 5 03:07:28 PDT 2015


They are not arch-specific, so installing them in $libdir is not needed.
---
 Makefile.am                | 2 +-
 python_modules/Makefile.am | 2 +-
 spice-protocol.pc.in       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 53e87be..4af20db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = python_modules spice
 
-codegendir = $(libdir)/spice-protocol
+codegendir = $(datadir)/spice-protocol
 dist_codegen_DATA =			\
 	spice.proto			\
 	spice1.proto			\
diff --git a/python_modules/Makefile.am b/python_modules/Makefile.am
index 3a4515a..98ab41f 100644
--- a/python_modules/Makefile.am
+++ b/python_modules/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-python_codegendir = $(libdir)/spice-protocol/python_modules
+python_codegendir = $(datadir)/spice-protocol/python_modules
 dist_python_codegen_DATA =		\
 	__init__.py			\
 	codegen.py			\
diff --git a/spice-protocol.pc.in b/spice-protocol.pc.in
index 173781a..a55574f 100644
--- a/spice-protocol.pc.in
+++ b/spice-protocol.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
-exec_prefix=@exec_prefix@
 includedir=@includedir@
-codegendir=@libdir@/spice-protocol
+datadir=${prefix}/share
+codegendir=${datadir}/spice-protocol
 
 Name: spice-protocol
 Description: SPICE protocol headers
-- 
2.5.0



More information about the Spice-devel mailing list