colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: remove duplicate and unused RUNDIR define

Browse Source
This commit is contained in:
Thomas Haller
2019-05-14 10:14:43 +02:00
parent 5c3f5a846e
commit ad142e1945
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -127,7 +127,6 @@ config-extra.h: Makefile
echo "#define NM_BUILD_SRCDIR \"$(abs_srcdir)\"" >>$@ && \ echo "#define NM_BUILD_SRCDIR \"$(abs_srcdir)\"" >>$@ && \
echo "#define PPPD_PLUGIN_DIR \"$(PPPD_PLUGIN_DIR)\"" >>$@ && \ echo "#define PPPD_PLUGIN_DIR \"$(PPPD_PLUGIN_DIR)\"" >>$@ && \
echo "#define PREFIX \"$(prefix)\"" >>$@ && \ echo "#define PREFIX \"$(prefix)\"" >>$@ && \
echo "#define RUNDIR \"$(rundir)\"" >>$@ && \
echo "#define RUNSTATEDIR \"$(runstatedir)\"" >>$@ && \ echo "#define RUNSTATEDIR \"$(runstatedir)\"" >>$@ && \
echo "#define SYSCONFDIR \"$(sysconfdir)\"" >>$@ && \ echo "#define SYSCONFDIR \"$(sysconfdir)\"" >>$@ && \
true true

1
config-extra.h.meson
View File

@@ -13,6 +13,5 @@
#mesondefine NM_BUILD_SRCDIR #mesondefine NM_BUILD_SRCDIR
#mesondefine PPPD_PLUGIN_DIR #mesondefine PPPD_PLUGIN_DIR
#mesondefine PREFIX #mesondefine PREFIX
#mesondefine RUNDIR
#mesondefine RUNSTATEDIR #mesondefine RUNSTATEDIR
#mesondefine SYSCONFDIR #mesondefine SYSCONFDIR

4
meson.build
View File

@@ -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('LOCALSTATEDIR', nm_localstatedir)
config_extra_h.set_quoted('NMCONFDIR', nm_pkgconfdir) 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('NMLIBDIR', nm_pkglibdir)
config_extra_h.set_quoted('NMLOCALEDIR', nm_localedir) config_extra_h.set_quoted('NMLOCALEDIR', nm_localedir)
config_extra_h.set_quoted('NMPLUGINDIR', nm_plugindir) config_extra_h.set_quoted('NMPLUGINDIR', nm_plugindir)
config_extra_h.set_quoted('NMRUNDIR', nm_pkgrundir) 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_BUILDDIR', meson.build_root())
config_extra_h.set_quoted('NM_BUILD_SRCDIR', meson.source_root()) config_extra_h.set_quoted('NM_BUILD_SRCDIR', meson.source_root())
if enable_ppp 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 endif
config_extra_h.set_quoted('PREFIX', nm_prefix) 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('RUNSTATEDIR', nm_runstatedir)
config_extra_h.set_quoted('SYSCONFDIR', nm_sysconfdir) config_extra_h.set_quoted('SYSCONFDIR', nm_sysconfdir)