Skip to content

Commit 2209c70

Browse files
committed
Avoid unnecessary "touch meson.build" in vpath builds
In e692727 I added a 'touch meson.build' to configure.ac, to ensure conflicts between in-tree configure based builds and meson builds are automatically detected. Unfortunately I omitted spaces around the condition restricting this to in-tree builds, leading to touch meson.build to also be executed in vpath builds. While the only consequence of this buglet is an unnecessary empty file in build directories, it seems worth backpatching. Reported-by: Christoph Berg <myon@debian.org> Discussion: https://postgr.es/m/20240417230002.mb2gv3hyetyn67gk@awork3.anarazel.de Backpatch: 16-, where the meson based build was added
1 parent a9155ef commit 2209c70

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20827,6 +20827,6 @@ fi
2082720827

2082820828
# Ensure that any meson build directories would reconfigure and see that
2082920829
# there's a conflicting in-tree build and can error out.
20830-
if test "$vpath_build"="no"; then
20830+
if test "$vpath_build" = "no"; then
2083120831
touch meson.build
2083220832
fi

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2500,6 +2500,6 @@ AC_OUTPUT
25002500

25012501
# Ensure that any meson build directories would reconfigure and see that
25022502
# there's a conflicting in-tree build and can error out.
2503-
if test "$vpath_build"="no"; then
2503+
if test "$vpath_build" = "no"; then
25042504
touch meson.build
25052505
fi

0 commit comments

Comments
 (0)