diff options
| -rw-r--r-- | meson.build | 1 | ||||
| -rwxr-xr-x | util/meson_aux/extra-dist-cmd.sh | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/meson.build b/meson.build index a47e2df..57fe072 100644 --- a/meson.build +++ b/meson.build @@ -258,7 +258,6 @@ if not meson.is_subproject() 'util' / 'meson_aux' / 'extra-dist-cmd.sh', meson.current_source_dir(), meson.current_build_dir(), - 'meson-dist' / meson.project_name() + '-' + meson.project_version(), ) endif diff --git a/util/meson_aux/extra-dist-cmd.sh b/util/meson_aux/extra-dist-cmd.sh index 186d7e4..1c61ed1 100755 --- a/util/meson_aux/extra-dist-cmd.sh +++ b/util/meson_aux/extra-dist-cmd.sh @@ -2,17 +2,16 @@ # External command, intended to be called with meson.add_dist_script() in meson.build -# extra-dist-cmd.sh <root_source_dir> <root_build_dir> <relative_dist_dir> +# extra-dist-cmd.sh <root_source_dir> <root_build_dir> -# <relative_dist_dir> is the distribution directory path relative to <root_build_dir>. # Meson does not preserve timestamps on distributed files. # But this script preserves the timestamps on libstdc++.tag. # Make a ChangeLog file for distribution. git --git-dir="$1/.git" --work-tree="$1" log --no-merges --date=short --max-count=200 \ - --pretty='tformat:%cd %an <%ae>%n%n %s%n%w(0,0,2)%+b' > "$2/$3/ChangeLog" + --pretty='tformat:%cd %an <%ae>%n%n %s%n%w(0,0,2)%+b' > "$MESON_DIST_ROOT/ChangeLog" # Distribute the libstdc++.tag file in addition to the files in the local git clone. # -p == --preserve=mode,ownership,timestamps (Posix does not support long options.) # Only the preservation of timestamps is essential here. -cp -p "$2/libstdc++.tag" "$2/$3/doctags/" +cp -p "$2/libstdc++.tag" "$MESON_DIST_ROOT/doctags/" |