diff options
| author | Andres Freund <andres@anarazel.de> | 2024-04-25 07:51:33 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2024-04-25 07:51:33 -0700 |
| commit | 2209c70c652e57314961a25725266821721415b8 (patch) | |
| tree | 2817ca1d830120e6c0a3914ed9ee11251a7d7f09 | |
| parent | a9155efc7004a49b387f061dd90cb0b59a6d146f (diff) | |
| download | postgresql-2209c70c652e57314961a25725266821721415b8.tar.gz postgresql-2209c70c652e57314961a25725266821721415b8.zip | |
Avoid unnecessary "touch meson.build" in vpath builds
In e6927270cd1 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
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure index 375a8b7dbc4..0d29e35c20f 100755 --- a/configure +++ b/configure @@ -20827,6 +20827,6 @@ fi # Ensure that any meson build directories would reconfigure and see that # there's a conflicting in-tree build and can error out. -if test "$vpath_build"="no"; then +if test "$vpath_build" = "no"; then touch meson.build fi diff --git a/configure.ac b/configure.ac index aed940410c3..ee4e3e2b664 100644 --- a/configure.ac +++ b/configure.ac @@ -2500,6 +2500,6 @@ AC_OUTPUT # Ensure that any meson build directories would reconfigure and see that # there's a conflicting in-tree build and can error out. -if test "$vpath_build"="no"; then +if test "$vpath_build" = "no"; then touch meson.build fi |