From 81c3ab2d602b3c9af811277173efbdec9446c928 Mon Sep 17 00:00:00 2001 From: Stepan Kasal Date: Tue, 15 May 2007 20:46:27 +0200 Subject: [PATCH] build-sys: do not use wildcards in EXTRA_DIST Wildcards in EXTRA_DIST break "make dist" for vpath build. But plain directory names are ok. Signed-off-by: Stepan Kasal --- Makefile.am | 6 +++--- fdisk/Makefile.am | 2 +- hwclock/Makefile.am | 2 +- misc-utils/Makefile.am | 5 +++-- tests/Makefile.am | 4 ++-- text-utils/Makefile.am | 4 +++- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 69b602b2..a7ce8362 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,9 +20,9 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = config/include-Makefile.am \ autogen.sh \ - README.* \ - licenses/* \ - example.files/* \ + README.devel \ + licenses/ \ + example.files/ \ po/Makevars.template \ po/update-potfiles diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am index 904d0019..38d1ed2f 100644 --- a/fdisk/Makefile.am +++ b/fdisk/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = README.* sfdisk.examples partitiontype.c +EXTRA_DIST = README.fdisk README.cfdisk sfdisk.examples partitiontype.c if !M68K diff --git a/hwclock/Makefile.am b/hwclock/Makefile.am index 80207d0d..dac1541c 100644 --- a/hwclock/Makefile.am +++ b/hwclock/Makefile.am @@ -11,4 +11,4 @@ if HAVE_AUDIT hwclock_LDADD += -laudit endif -EXTRA_DIST = README.* clock-ppc.c +EXTRA_DIST = README.hwclock clock-ppc.c diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index c16024cf..30836706 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -1,11 +1,12 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = README.* +EXTRA_DIST = README.flushb bin_PROGRAMS = usrbinexec_PROGRAMS = cal ddate logger look mcookie \ namei script whereis +EXTRA_DIST += README.cal README.ddate README.namei README.namei2 mcookie_SOURCES = mcookie.c ../lib/md5.c @@ -49,7 +50,7 @@ if BUILD_RESET dist_usrbinexec_SCRIPTS = reset man_MANS += reset.1 endif -EXTRA_DIST += reset.033c +EXTRA_DIST += README.reset reset.033c if BUILD_WRITE diff --git a/tests/Makefile.am b/tests/Makefile.am index fdcbf198..ad9e4b60 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,9 +2,9 @@ include $(top_srcdir)/config/include-Makefile.am SUBDIRS = helpers -EXTRA_DIST = expected/* \ +EXTRA_DIST = expected/ \ functions.sh \ - input/* \ + input/ \ README \ run.sh \ ts-col-multibyte \ diff --git a/text-utils/Makefile.am b/text-utils/Makefile.am index f3c3dca8..9ec071df 100644 --- a/text-utils/Makefile.am +++ b/text-utils/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = README.* LICENSE.* +EXTRA_DIST = README.clear README.col usrbinexec_PROGRAMS = col colcrt colrm column hexdump rev line tailf @@ -23,3 +23,5 @@ more_LDADD = -ltermcap man_MANS += more.1 endif endif + +EXTRA_DIST += README.pg LICENSE.pg -- 2.39.5