BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build: Delay expansion of $datadir in FIRMWARE_DIR 

Make it so that $(datadir) is resolved at make time, as per
autotools recommendations.  Note that $datadir is not fully
resolved at configure time to begin with, i.e. part of it
already was evaluated at make time.
This commit is contained in:
Daniel Elstner 2015-08-14 18:03:47 +02:00
parent b2478a23db
commit 27a2497dc2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -559,7 +559,7 @@ AM_CONDITIONAL(BINDINGS_JAVA, test x$BINDINGS_JAVA = xyes)
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_SUBST(FIRMWARE_DIR, "$datadir/sigrok-firmware") AC_SUBST([FIRMWARE_DIR], ['$(datadir)/sigrok-firmware'])
AC_SUBST(MAKEFLAGS, '--no-print-directory') AC_SUBST(MAKEFLAGS, '--no-print-directory')
AC_SUBST(AM_LIBTOOLFLAGS, '--silent') AC_SUBST(AM_LIBTOOLFLAGS, '--silent')