From: Daniel Elstner <redacted>
Date: Mon, 24 Aug 2015 20:20:30 +0000 (+0200)
Subject: Build: Reduce unnecessary config substitutions
X-Git-Tag: libsigrok-0.4.0~402
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=ba1c29dc2227dc0d4c47e189ce0682ee63a862a7;p=libsigrok.git

Build: Reduce unnecessary config substitutions

Variable substitutions with a constant value may as well be
set directly in Makefile.am.
---

diff --git a/Makefile.am b/Makefile.am
index eb2398fa..96a7e15b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,10 @@
 ##
 
 ACLOCAL_AMFLAGS = -I m4
+AM_LIBTOOLFLAGS = --silent
+MAKEFLAGS = --no-print-directory
+
+FIRMWARE_DIR = $(datadir)/sigrok-firmware
 
 local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I.
 if BINDINGS_CXX
diff --git a/configure.ac b/configure.ac
index 2ceea513..c32112dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -412,10 +412,6 @@ AC_DEFINE_UNQUOTED([CONF_LIBZIP_VERSION], ["$sr_libzip_version"],
 AC_DEFINE_UNQUOTED([CONF_HOST], ["$host"],
 	[The canonical host libsigrok will run on.])
 
-AC_SUBST([FIRMWARE_DIR], ['$(datadir)/sigrok-firmware'])
-AC_SUBST([MAKEFLAGS], ['--no-print-directory'])
-AC_SUBST([AM_LIBTOOLFLAGS], ['--silent'])
-
 AC_CONFIG_FILES([Makefile libsigrok.pc bindings/cxx/libsigrokcxx.pc])
 
 AC_OUTPUT