Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
NetworkManager
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
145
Issues
145
List
Boards
Labels
Service Desk
Milestones
Merge Requests
11
Merge Requests
11
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NetworkManager
NetworkManager
Commits
ad142e19
Commit
ad142e19
authored
May 14, 2019
by
Thomas Haller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: remove duplicate and unused RUNDIR define
parent
5c3f5a84
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
5 deletions
+1
-5
Makefile.am
Makefile.am
+0
-1
config-extra.h.meson
config-extra.h.meson
+0
-1
meson.build
meson.build
+1
-3
No files found.
Makefile.am
View file @
ad142e19
...
...
@@ -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
...
...
config-extra.h.meson
View file @
ad142e19
...
...
@@ -13,6 +13,5 @@
#mesondefine NM_BUILD_SRCDIR
#mesondefine PPPD_PLUGIN_DIR
#mesondefine PREFIX
#mesondefine RUNDIR
#mesondefine RUNSTATEDIR
#mesondefine SYSCONFDIR
meson.build
View file @
ad142e19
...
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment