koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autotools: place binaries in top level of build dir, not in subdirs (#4093)

Browse Source 
meson only supports the top level (no subdirs), so this makes the transition
easier.

For this to work with autotools, we need to *disable* the subdir-objects option,
that autotools wants us to enable for forward-compatibility.

This results in a bunch of warnings at autoreconf-time, but we don’t care, given
that we intend to switch away from autotools. Both build systems working next to
each other (as best as they can) is more important.

related to #4086
This commit is contained in:
Michael Stapelberg
2020-05-18 22:18:00 +02:00
committed by GitHub
parent 75963cd088
commit ef8935b1db
4 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
testcases/complete-run.pl.in
View File

@ -78,12 +78,12 @@ pod2usage(-verbose => 2, -exitcode => 0) if $help;
# Check for missing executables
my @binaries = qw(
@abs_top_builddir@/i3
@abs_top_builddir@/i3bar/i3bar
@abs_top_builddir@/i3-config-wizard/i3-config-wizard
@abs_top_builddir@/i3-dump-log/i3-dump-log
@abs_top_builddir@/i3-input/i3-input
@abs_top_builddir@/i3-msg/i3-msg
@abs_top_builddir@/i3-nagbar/i3-nagbar
@abs_top_builddir@/i3bar
@abs_top_builddir@/i3-config-wizard
@abs_top_builddir@/i3-dump-log
@abs_top_builddir@/i3-input
@abs_top_builddir@/i3-msg
@abs_top_builddir@/i3-nagbar
);
foreach my $binary (@binaries) {
@ -103,12 +103,6 @@ foreach my $binary (@test_binaries) {
}
$ENV{PATH} = join(':',
'@abs_top_builddir@/i3-nagbar',
'@abs_top_builddir@/i3-msg',
'@abs_top_builddir@/i3-input',
'@abs_top_builddir@/i3-dump-log',
'@abs_top_builddir@/i3-config-wizard',
'@abs_top_builddir@/i3bar',
'@abs_top_builddir@',
'@abs_top_srcdir@',
$ENV{PATH});