Skip to content

Commit

Permalink
build: clean up variables
Browse files Browse the repository at this point in the history
  • Loading branch information
williamh committed Sep 20, 2024
1 parent 2406f3a commit 038e5f5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
13 changes: 7 additions & 6 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,12 @@ else
pkg_prefix = option_pkg_prefix
endif

bindir = get_option('bindir')
libdir = get_option('libdir')
libexecdir = get_option('libexecdir')
sbindir = get_option('sbindir')
rc_libexecdir = get_option('prefix') / libexecdir / 'rc'
bindir = get_option('prefix') / get_option('bindir')
libdir = get_option('prefix') / get_option('libdir')
pluginsdir = libdir / 'rc/plugins'
libexecdir = get_option('prefix') / get_option('libexecdir')
sbindir = get_option('prefix') / get_option('sbindir')
rc_libexecdir = libexecdir / 'rc'
rc_bindir = rc_libexecdir / 'bin'
rc_sbindir = rc_libexecdir / 'sbin'
rc_shdir = rc_libexecdir / 'sh'
Expand Down Expand Up @@ -221,7 +222,7 @@ if get_option('pkgconfig')
libraries : librc,
subdirs : ['openrc'],
variables: {
'pluginsdir': get_option('prefix') / get_option('libdir') / 'rc/plugins',
'pluginsdir': pluginsdir,
}
)
endif
Expand Down
4 changes: 2 additions & 2 deletions src/librc/meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
rc_h_conf_data = configuration_data()
rc_h_conf_data.set('RC_LIBEXECDIR', get_option('prefix') / get_option('libexecdir') / 'rc')
rc_h_conf_data.set('RC_PLUGINDIR', get_option('prefix') / libdir / 'rc/plugins' )
rc_h_conf_data.set('RC_LIBEXECDIR', rc_libexecdir)
rc_h_conf_data.set('RC_PLUGINDIR', pluginsdir)
rc_h_conf_data.set('LOCAL_PREFIX', local_prefix)
rc_h_conf_data.set('PKG_PREFIX', pkg_prefix)
rc_h_conf_data.set('SYSCONFDIR', get_option('sysconfdir'))
Expand Down

0 comments on commit 038e5f5

Please sign in to comment.