[beast: 32/41] BUILD: allow DESTDIR overrides for pkg-config
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast: 32/41] BUILD: allow DESTDIR overrides for pkg-config
- Date: Fri, 16 Jun 2017 10:25:29 +0000 (UTC)
commit cbcef01b9f64d8d6bc76a3c02f6993b334f058e4
Author: Tim Janik <timj gnu org>
Date: Wed Jun 14 22:35:20 2017 +0200
BUILD: allow DESTDIR overrides for pkg-config
Signed-off-by: Tim Janik <timj gnu org>
Makefile.am | 6 +++---
data/bse.pc.in | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 09f6ee9..2b8bb32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,11 +44,11 @@ bse-app-test:
&& echo ' Bse::init_async (&argc, argv, "bse-app-test");' >> tmpx.cc \
&& echo ' return 0; }' >> tmpx.cc \
; X=$$? ; echo -n "Create BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL;
exit $$X ; }
- $(Q) $(CXX) -Werror tmpx.cc -c
`PKG_CONFIG_PATH="$(bselibdir)/pkgconfig:$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" pkg-config --cflags bse` \
+ $(Q) $(CXX) -Werror tmpx.cc -c
`PKG_CONFIG_PATH="$(DESTDIR)$(bselibdir)/pkgconfig:$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" pkg-config --cflags
bse` \
; X=$$? ; echo -n "Compile BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL;
exit $$X ; }
- $(Q) $(CXX) -Werror tmpx.o -o tmpx
`PKG_CONFIG_PATH="$(bselibdir)/pkgconfig:$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" pkg-config --libs bse` \
+ $(Q) $(CXX) -Werror tmpx.o -o tmpx
`PKG_CONFIG_PATH="$(DESTDIR)$(bselibdir)/pkgconfig:$(libdir)/pkgconfig:$$PKG_CONFIG_PATH" pkg-config --libs
bse` \
; X=$$? ; echo -n "Link BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL;
exit $$X ; }
- $(Q) LD_LIBRARY_PATH="$(bselibdir):$$LD_LIBRARY_PATH" ./tmpx \
+ $(Q) LD_LIBRARY_PATH="$(DESTDIR)$(bselibdir):$$LD_LIBRARY_PATH" ./tmpx \
; X=$$? ; echo -n "Execute BSE sample program: " ; test 0 == $$X && echo OK || { echo FAIL;
exit $$X ; }
$(Q) rm -f tmpx.o tmpx.cc tmpx
installcheck-local: bse-app-test
diff --git a/data/bse.pc.in b/data/bse.pc.in
index c7495ec..ea80bc8 100644
--- a/data/bse.pc.in
+++ b/data/bse.pc.in
@@ -1,9 +1,10 @@
-prefix=@prefix@
+destdir=
+beastdestdir=
+prefix=${destdir}@prefix@
exec_prefix=@exec_prefix@
-beastdir=@beastdir@
+beastdir=${beastdestdir}@beastdir@
bselibdir=@bselibdir@
datarootdir=@datarootdir@
-datadir=@datadir@
bseincludedir=@bseincludedir@
sfidl=@exec_prefix@/sfidl
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]