[librsvg/hospitality: 6/12] Makefile.am: Refactor some variable substitutions
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg/hospitality: 6/12] Makefile.am: Refactor some variable substitutions
- Date: Thu, 30 Nov 2017 15:32:58 +0000 (UTC)
commit d55929b1fa6cf596ed512ddc2d7336d1a31ae835
Author: Federico Mena Quintero <federico gnome org>
Date: Thu Nov 30 08:32:08 2017 -0600
Makefile.am: Refactor some variable substitutions
Makefile.am | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 36d58ad..b8a17b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,14 +119,15 @@ cargo_verbose_0 =
cargo_verbose_1 = --verbose
RUST_LIB=@abs_top_builddir@/rust/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
+CARGO_TARGET_DIR=@abs_top_builddir@/rust/target
check-local:
cd $(srcdir)/rust && \
- CARGO_TARGET_DIR=@abs_top_builddir@/rust/target cargo test
+ CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo test
clean-local:
cd $(top_srcdir)/rust && \
- CARGO_TARGET_DIR=@abs_top_builddir@/rust/target cargo clean
+ CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) clean
dist-hook:
(cd $(distdir)/rust && \
@@ -138,7 +139,7 @@ $(RUST_LIB): $(RUST_SOURCES)
+cd $(top_srcdir)/rust && \
PKG_CONFIG_ALLOW_CROSS=1 \
PKG_CONFIG='$(PKG_CONFIG)' \
- CARGO_TARGET_DIR=@abs_top_builddir@/rust/target \
+ CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
cargo build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS)
librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]