diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-08-21 10:52:24 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-08-21 10:53:16 +0200 |
| commit | 4fb5879c4443ac534ab5ac99ca5adbcbacfbe66c (patch) | |
| tree | c642ac1399056aee977284297599d9ea09797251 | |
| parent | 02a136682c749a0fd27853c0152d36c44635151f (diff) | |
| download | NetworkManager-4fb5879c4443ac534ab5ac99ca5adbcbacfbe66c.tar.gz | |
build: avoid premature expanding
We want ${prefix} unexpanded in a .pc files and the rest expands just fine in
Makefiles.
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 1adca20c68..0deb4a4098 100644 --- a/configure.ac +++ b/configure.ac @@ -76,12 +76,12 @@ AS_IF([test -z "$runstatedir"], runstatedir="$localstatedir/run") AC_SUBST(runstatedir) # NetworkManager paths -AC_SUBST(nmbinary, "$sbindir/$PACKAGE", [NetworkManager binary executable]) -AC_SUBST(nmconfdir, "$sysconfdir/$PACKAGE", [NetworkManager configuration directory]) -AC_SUBST(nmlibdir, "$prefix/lib/$PACKAGE", [NetworkManager library directory]) -AC_SUBST(nmdatadir, "$datadir/$PACKAGE", [NetworkManager shared data directory]) -AC_SUBST(nmstatedir, "$localstatedir/lib/$PACKAGE", [NetworkManager persistent state directory]) -AC_SUBST(nmrundir, "$runstatedir/$PACKAGE", [NetworkManager runtime state directory]) +AC_SUBST(nmbinary, '${sbindir}'/$PACKAGE, [NetworkManager binary executable]) +AC_SUBST(nmconfdir, '${sysconfdir}'/$PACKAGE, [NetworkManager configuration directory]) +AC_SUBST(nmlibdir, '${prefix}'/lib/$PACKAGE, [NetworkManager library directory]) +AC_SUBST(nmdatadir, '${datadir}'/$PACKAGE, [NetworkManager shared data directory]) +AC_SUBST(nmstatedir, '${localstatedir}'/lib/$PACKAGE, [NetworkManager persistent state directory]) +AC_SUBST(nmrundir, '${runstatedir}'/$PACKAGE, [NetworkManager runtime state directory]) # Alternative configuration plugins AC_ARG_ENABLE(config-plugin-ibft, AS_HELP_STRING([--enable-config-plugin-ibft], [enable ibft configuration plugin])) |