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 eb2398fa5de299184db6ac45cd7363bcaaaa3de5..96a7e15b41617c85c676ac7db5c1e94ec12deadd 100644 (file)
--- 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 2ceea513c0dc8a58feb4c2578c9ada326bc75f63..c32112dc43df782abe9d52f1f44d53ffc16008ad 100644 (file)
--- 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