GNOME.org
 

[valadoc] build: Don't rely on bashism and use $(shell ...)

commit 5ba35ce497a749245093f66ad64b3463b0f5b955
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sat Jan 18 09:44:36 2014 +0100

    build: Don't rely on bashism and use $(shell ...)

 src/driver/0.16.x/Makefile.am |    2 +-
 src/driver/0.18.x/Makefile.am |    2 +-
 src/driver/0.20.x/Makefile.am |    2 +-
 src/driver/0.22.x/Makefile.am |    2 +-
 src/driver/0.24.x/Makefile.am |    2 +-
 src/libvaladoc/Makefile.am    |    2 +-
 src/valadoc/Makefile.am       |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/driver/0.16.x/Makefile.am b/src/driver/0.16.x/Makefile.am
index 0d1b8b7..9639caa 100644
--- a/src/driver/0.16.x/Makefile.am
+++ b/src/driver/0.16.x/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-VERSIONED_VAPI_DIR=`pkg-config libvala-0.16 --variable vapidir`
+VERSIONED_VAPI_DIR = $(shell pkg-config libvala-0.16 --variable vapidir)
 
 AM_CFLAGS = \
        -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
diff --git a/src/driver/0.18.x/Makefile.am b/src/driver/0.18.x/Makefile.am
index bd5016c..a24befd 100644
--- a/src/driver/0.18.x/Makefile.am
+++ b/src/driver/0.18.x/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-VERSIONED_VAPI_DIR=`pkg-config libvala-0.18 --variable vapidir`
+VERSIONED_VAPI_DIR = $(shell pkg-config libvala-0.18 --variable vapidir)
 
 AM_CFLAGS = \
        -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
diff --git a/src/driver/0.20.x/Makefile.am b/src/driver/0.20.x/Makefile.am
index 08a7131..cafd9c2 100644
--- a/src/driver/0.20.x/Makefile.am
+++ b/src/driver/0.20.x/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-VERSIONED_VAPI_DIR=`pkg-config libvala-0.20 --variable vapidir`
+VERSIONED_VAPI_DIR = $(shell pkg-config libvala-0.20 --variable vapidir)
 
 AM_CFLAGS = \
        -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
diff --git a/src/driver/0.22.x/Makefile.am b/src/driver/0.22.x/Makefile.am
index 10cf617..4f114b7 100644
--- a/src/driver/0.22.x/Makefile.am
+++ b/src/driver/0.22.x/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-VERSIONED_VAPI_DIR=`pkg-config libvala-0.22 --variable vapidir`
+VERSIONED_VAPI_DIR = $(shell pkg-config libvala-0.22 --variable vapidir)
 
 AM_CFLAGS = \
        -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
diff --git a/src/driver/0.24.x/Makefile.am b/src/driver/0.24.x/Makefile.am
index 0ba1345..77e75c2 100644
--- a/src/driver/0.24.x/Makefile.am
+++ b/src/driver/0.24.x/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-VERSIONED_VAPI_DIR=`pkg-config libvala-0.24 --variable vapidir`
+VERSIONED_VAPI_DIR = $(shell pkg-config libvala-0.24 --variable vapidir)
 
 if HAVE_LIBVALA_0_23_1
 VALAFLAGS = -D VALA_0_23_1
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 20acee1..55bb6ba 100644
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-DEFAULT_DRIVER = "`$(VALAC) --api-version >& /dev/null; if [ $$? = 0 ]; then $(VALAC) --api-version; else 
$(VALAC) --version; fi`"
+DEFAULT_DRIVER = $(shell $(VALAC) --api-version >& /dev/null; if [ $$? = 0 ]; then $(VALAC) --api-version; 
else $(VALAC) --version; fi)
 
 AM_CFLAGS = \
        -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
diff --git a/src/valadoc/Makefile.am b/src/valadoc/Makefile.am
index 6b247d7..1c443de 100644
--- a/src/valadoc/Makefile.am
+++ b/src/valadoc/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-DEFAULT_DRIVER = "`$(VALAC) --api-version >& /dev/null; if [ $$? = 0 ]; then $(VALAC) --api-version; else 
$(VALAC) --version; fi`"
+DEFAULT_DRIVER = $(shell $(VALAC) --api-version >& /dev/null; if [ $$? = 0 ]; then $(VALAC) --api-version; 
else $(VALAC) --version; fi)
 
 AM_CFLAGS = \
        -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]