From fab526c032de1ff61ca5bb7615bf5d35a134163c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 2 Aug 2024 09:49:31 +0200 Subject: [PATCH] Makefile: remove 'scripts' duplicate from DIST_SUBDIRS Also fix the .dist replacing by avoiding all Makefiles because it otherwise also went into the temporary release folder and got confused about the Makefile.dist in there. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 74441402d8..c0c0778a5d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,7 +88,7 @@ CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) \ bin_SCRIPTS = curl-config SUBDIRS = lib docs src scripts -DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs +DIST_SUBDIRS = $(SUBDIRS) tests packages include docs pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcurl.pc @@ -102,7 +102,7 @@ include src/Makefile.inc dist-hook: rm -rf $(top_builddir)/tests/log find $(distdir) -name "*.dist" -a \! -name Makefile.dist -exec rm {} \; - (distit=`find $(srcdir) -name "*.dist"`; \ + (distit=`find $(srcdir) -name "*.dist" | grep -v Makefile`; \ for file in $$distit; do \ strip=`echo $$file | sed -e s/^$(srcdir)// -e s/\.dist//`; \ cp -p $$file $(distdir)$$strip; \ -- 2.47.3