fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-23 20:10:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: substitute config directory in Makefile

Browse source 
The autoconf substitutions should be expanded in Makefiles and shell scripts
only, does not work well in XML.

Fixes: 3e0b590e10
This commit is contained in:
Lubomir Rintel 2015-11-27 14:10:01 +01:00
parent 3e0b590e10
commit 90683fcb3a
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -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

10
man/Makefile.am
View file

@ -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