diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-05-14 10:14:43 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-05-17 21:24:18 +0200 |
| commit | ad142e1945062dc855d95bf6a2b51c218251d8c6 (patch) | |
| tree | 7b6831d55a5e22a74b1e2dc774faa1d3c3f960ce | |
| parent | 5c3f5a846e89912a44ac744dffd4c70a2225ac39 (diff) | |
| download | NetworkManager-ad142e1945062dc855d95bf6a2b51c218251d8c6.tar.gz | |
build: remove duplicate and unused RUNDIR define
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | config-extra.h.meson | 1 | ||||
| -rw-r--r-- | meson.build | 4 |
3 files changed, 1 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 3fa232b84c..30557d8ab5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,7 +127,6 @@ config-extra.h: Makefile echo "#define NM_BUILD_SRCDIR \"$(abs_srcdir)\"" >>$@ && \ echo "#define PPPD_PLUGIN_DIR \"$(PPPD_PLUGIN_DIR)\"" >>$@ && \ echo "#define PREFIX \"$(prefix)\"" >>$@ && \ - echo "#define RUNDIR \"$(rundir)\"" >>$@ && \ echo "#define RUNSTATEDIR \"$(runstatedir)\"" >>$@ && \ echo "#define SYSCONFDIR \"$(sysconfdir)\"" >>$@ && \ true diff --git a/config-extra.h.meson b/config-extra.h.meson index 34c962fdd5..c539530548 100644 --- a/config-extra.h.meson +++ b/config-extra.h.meson @@ -13,6 +13,5 @@ #mesondefine NM_BUILD_SRCDIR #mesondefine PPPD_PLUGIN_DIR #mesondefine PREFIX -#mesondefine RUNDIR #mesondefine RUNSTATEDIR #mesondefine SYSCONFDIR diff --git a/meson.build b/meson.build index 8e34ab2e23..e6b220c62b 100644 --- a/meson.build +++ b/meson.build @@ -862,7 +862,6 @@ config_extra_h.set_quoted('LIBEXECDIR', nm_libexecdir) config_extra_h.set_quoted('LOCALSTATEDIR', nm_localstatedir) config_extra_h.set_quoted('NMCONFDIR', nm_pkgconfdir) config_extra_h.set_quoted('NMLIBDIR', nm_pkglibdir) -config_extra_h.set_quoted('NMLIBDIR', nm_pkglibdir) config_extra_h.set_quoted('NMLOCALEDIR', nm_localedir) config_extra_h.set_quoted('NMPLUGINDIR', nm_plugindir) config_extra_h.set_quoted('NMRUNDIR', nm_pkgrundir) @@ -871,10 +870,9 @@ config_extra_h.set_quoted('NMVPNDIR', nm_vpndir) config_extra_h.set_quoted('NM_BUILD_BUILDDIR', meson.build_root()) config_extra_h.set_quoted('NM_BUILD_SRCDIR', meson.source_root()) if enable_ppp - config_extra_h.set_quoted('PPPD_PLUGIN_DIR', pppd_plugin_dir) + config_extra_h.set_quoted('PPPD_PLUGIN_DIR', pppd_plugin_dir) endif config_extra_h.set_quoted('PREFIX', nm_prefix) -config_extra_h.set_quoted('RUNDIR', nm_pkgrundir) config_extra_h.set_quoted('RUNSTATEDIR', nm_runstatedir) config_extra_h.set_quoted('SYSCONFDIR', nm_sysconfdir) |