[ovs-dev,ovn] Makefile.am: Fix dist-hook-git target.
diff mbox series

Message ID 20200208233252.2112970-1-blp@ovn.org
State New
Headers show
Series
  • [ovs-dev,ovn] Makefile.am: Fix dist-hook-git target.
Related show

Commit Message

Ben Pfaff Feb. 8, 2020, 11:32 p.m. UTC
This was broken and always printed an error.

Signed-off-by: Ben Pfaff <blp@ovn.org>
---
 Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Numan Siddique Feb. 10, 2020, 7:11 a.m. UTC | #1
On Sun, Feb 9, 2020 at 5:03 AM Ben Pfaff <blp@ovn.org> wrote:
>
> This was broken and always printed an error.
>
> Signed-off-by: Ben Pfaff <blp@ovn.org>

Acked-by: Numan Siddique <numans@ovn.org>

Numan

> ---
>  Makefile.am | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index 1054ec21e64d..490a276085bb 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -225,19 +225,19 @@ dist-hook-git: distfiles
>           (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \
>             grep -v '\.gitattributes$$' | \
>             LC_ALL=C sort -u > all-gitfiles; \
> -         LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \
> +         LC_ALL=C comm -1 -3 distfiles all-gitfiles > missing-distfiles; \
>           if test -s missing-distfiles; then \
>             echo "The following files are in git but not the distribution:"; \
>             cat missing-distfiles; \
>             exit 1; \
>           fi; \
> -         if LC_ALL=C grep '\.gitignore$$' all-distfiles; then \
> +         if LC_ALL=C grep '\.gitignore$$' distfiles; then \
>             echo "See above for list of files that are distributed but"; \
>             echo "should not be."; \
>             exit 1; \
>           fi \
>         fi
> -CLEANFILES += all-distfiles all-gitfiles missing-distfiles
> +CLEANFILES += distfiles all-gitfiles missing-distfiles
>  # The following is based on commands for the Automake "distdir" target.
>  distfiles: Makefile
>         @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
> --
> 2.24.1
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
Ben Pfaff Feb. 10, 2020, 4:20 p.m. UTC | #2
On Mon, Feb 10, 2020 at 12:41:29PM +0530, Numan Siddique wrote:
> On Sun, Feb 9, 2020 at 5:03 AM Ben Pfaff <blp@ovn.org> wrote:
> >
> > This was broken and always printed an error.
> >
> > Signed-off-by: Ben Pfaff <blp@ovn.org>
> 
> Acked-by: Numan Siddique <numans@ovn.org>

Thanks.  Applied to master.

Patch
diff mbox series

diff --git a/Makefile.am b/Makefile.am
index 1054ec21e64d..490a276085bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -225,19 +225,19 @@  dist-hook-git: distfiles
 	  (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \
 	    grep -v '\.gitattributes$$' | \
 	    LC_ALL=C sort -u > all-gitfiles; \
-	  LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \
+	  LC_ALL=C comm -1 -3 distfiles all-gitfiles > missing-distfiles; \
 	  if test -s missing-distfiles; then \
 	    echo "The following files are in git but not the distribution:"; \
 	    cat missing-distfiles; \
 	    exit 1; \
 	  fi; \
-	  if LC_ALL=C grep '\.gitignore$$' all-distfiles; then \
+	  if LC_ALL=C grep '\.gitignore$$' distfiles; then \
 	    echo "See above for list of files that are distributed but"; \
 	    echo "should not be."; \
 	    exit 1; \
 	  fi \
 	fi
-CLEANFILES += all-distfiles all-gitfiles missing-distfiles
+CLEANFILES += distfiles all-gitfiles missing-distfiles
 # The following is based on commands for the Automake "distdir" target.
 distfiles: Makefile
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \