mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-06 17:50:16 +01:00
build: use sed instead of AC_SUBST() to generate man/common.ent
Otherwise, substitions are not properly expanded.
For example
- "AC_SUBST(nmrundir, '${runstatedir}'/$PACKAGE, [NetworkManager runtime state directory])"
gives ${runstatedir}/NetworkManager/resolv.conf
- "AC_SUBST(nmrundir, "${runstatedir}/$PACKAGE", [NetworkManager runtime state directory])"
gives ${prefix}/var/run/NetworkManager/resolv.conf
(cherry picked from commit 4de6f603e3)
This commit is contained in:
parent
0770d7e68e
commit
d5b98617ad
3 changed files with 12 additions and 2 deletions
12
Makefile.am
12
Makefile.am
|
|
@ -3282,12 +3282,19 @@ endif
|
|||
###############################################################################
|
||||
|
||||
data_edit = sed \
|
||||
-e 's|@NM_VERSION[@]|$(NM_VERSION)|g' \
|
||||
-e 's|@bindir[@]|$(bindir)|g' \
|
||||
-e 's|@sbindir[@]|$(sbindir)|g' \
|
||||
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
|
||||
-e 's|@nmrundir[@]|$(nmrundir)|g' \
|
||||
-e 's|@localstatedir[@]|$(localstatedir)|g' \
|
||||
-e 's|@libexecdir[@]|$(libexecdir)|g' \
|
||||
-e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g'
|
||||
-e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g' \
|
||||
-e 's|@NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT[@]|$(NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT)|g' \
|
||||
-e 's|@NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT)|g' \
|
||||
-e 's|@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT[@]|$(NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT)|g' \
|
||||
-e 's|@NM_CONFIG_DEFAULT_MAIN_RC_MANAGER[@]|$(NM_CONFIG_DEFAULT_MAIN_RC_MANAGER)|g' \
|
||||
-e 's|@NM_CONFIG_DEFAULT_MAIN_DHCP[@]|$(NM_CONFIG_DEFAULT_MAIN_DHCP)|g'
|
||||
|
||||
if HAVE_SYSTEMD
|
||||
|
||||
|
|
@ -3943,6 +3950,9 @@ endif
|
|||
# man
|
||||
###############################################################################
|
||||
|
||||
man/common.ent: man/common.ent.in
|
||||
$(AM_V_GEN) $(data_edit) $< >$@
|
||||
|
||||
xsltproc_flags = \
|
||||
--path man \
|
||||
--xinclude \
|
||||
|
|
|
|||
|
|
@ -1165,7 +1165,6 @@ libnm/libnm.pc
|
|||
libnm-util/libnm-util.pc
|
||||
libnm-glib/libnm-glib.pc
|
||||
libnm-glib/libnm-glib-vpn.pc
|
||||
man/common.ent
|
||||
po/Makefile.in
|
||||
data/org.freedesktop.NetworkManager.policy.in
|
||||
docs/api/Makefile
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<!ENTITY NM_VERSION "@NM_VERSION@">
|
||||
<!ENTITY sysconfdir "@sysconfdir@">
|
||||
<!ENTITY nmrundir "@nmrundir@">
|
||||
<!ENTITY NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT "@NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT@">
|
||||
<!ENTITY NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT "@NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT@">
|
||||
<!ENTITY NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT "@NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@">
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue