From 3c63b147ec412515a492dc4bc1d56c59259c95eb Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt Date: Tue, 3 Sep 2019 12:06:51 +0200 Subject: util/meson_aux/extra-dist-cmd.sh: Use MESON_DIST_ROOT --- util/meson_aux/extra-dist-cmd.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'util') 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 +# extra-dist-cmd.sh -# is the distribution directory path relative to . # 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/" -- cgit v1.2.1