From 80a787baca9ac0cf8225b7b4b5f229d709e89b44 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 18 Jun 2023 08:51:02 +0200 Subject: [PATCH] Put "/" at end of .gitignore directory names * build-aux/bootstrap (symlink_to_dir, autogen): Put slashes after .gitignore entries that name directories. --- ChangeLog | 6 ++++++ build-aux/bootstrap | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dce81056f4..6bd1b7eb2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-06-06 Paul Eggert + + Put "/" at end of .gitignore directory names + * build-aux/bootstrap (symlink_to_dir, autogen): + Put slashes after .gitignore entries that name directories. + 2023-06-02 Bruno Haible striconveha: Don't crash if malloc() returns NULL. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 3cf75f4bbc..9f7ffcd534 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -4,7 +4,7 @@ scriptversion=2022-06-04.00; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2022 Free Software Foundation, Inc. +# Copyright (C) 2003-2023 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -374,7 +374,7 @@ symlink_to_dir() for dot_ig in x $vc_ignore; do test $dot_ig = x && continue ig=$parent/$dot_ig - insert_vc_ignore $ig "${dst_dir##*/}" + insert_vc_ignore $ig "${dst_dir##*/}/" done fi @@ -500,7 +500,7 @@ if test ! -d $build_aux; then mkdir $build_aux for dot_ig in x $vc_ignore; do test $dot_ig = x && continue - insert_vc_ignore $dot_ig $build_aux + insert_vc_ignore $dot_ig $build_aux/ done fi -- 2.39.5