diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-11-27 14:10:01 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-11-27 14:18:34 +0100 |
| commit | 90683fcb3a4a60d2902ebb7e4a47419d76acb1d8 (patch) | |
| tree | dabe33a96a46ae9d082821fbb98fa05ccb9040e2 | |
| parent | 3e0b590e107add3ab1d1ac23e473fcf0c5fe32b1 (diff) | |
| download | NetworkManager-90683fcb3a4a60d2902ebb7e4a47419d76acb1d8.tar.gz | |
build: substitute config directory in Makefile
The autoconf substitutions should be expanded in Makefiles and shell scripts
only, does not work well in XML.
Fixes: 3e0b590e107add3ab1d1ac23e473fcf0c5fe32b1
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | man/Makefile.am | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 3d28b14b9c..c028f32c54 100644 --- a/configure.ac +++ b/configure.ac @@ -1071,7 +1071,6 @@ initscript/linexa/networkmanager introspection/Makefile introspection/all.xml man/Makefile -man/NetworkManager.conf.xml man/nm-system-settings.conf.5 man/nm-online.1 man/nmcli.1 diff --git a/man/Makefile.am b/man/Makefile.am index e7262e717b..7caefd5662 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -25,6 +25,15 @@ if ENABLE_GTK_DOC endif +CLEANFILES += NetworkManager.conf.xml +NetworkManager.conf.xml: $(srcdir)/NetworkManager.conf.xml.in + $(AM_V_GEN) sed \ + -e 's|[@]NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT[@]|$(NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT)|g' \ + -e 's|[@]NM_CONFIG_KEYFILE_PATH_DEFAULT[@]|$(nmconfdir)/conf.d|g' \ + -e 's|[@]NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT[@]|$(NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT)|g' \ + -e 's|[@]NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT)|g' \ + $< >$@ + if BUILD_SETTING_DOCS nm-settings.xml: nm-settings.xsl $(top_builddir)/libnm/nm-setting-docs.xml @@ -109,4 +118,3 @@ man_MANS += \ $(docbook_autogenerated_man_pages) endif endif - |