From 0a4904a0e36f42f04a7ee73d1125b216466f9cab Mon Sep 17 00:00:00 2001 From: Thomas Adam Date: Sun, 20 Dec 2020 14:47:18 +0000 Subject: [PATCH] distcheck: add missing files Due to recent changes, "make distcheck" has been failing when trying to build a distribution tarball. --- bin/Makefile.am | 2 +- doc/Makefile.am | 2 +- modules/FvwmConsole/Makefile.am | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bin/Makefile.am b/bin/Makefile.am index 470fa2e63..29fa71c07 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -12,7 +12,7 @@ bin_SCRIPTS = fvwm-config fvwm-perllib \ fvwm-menu-desktop \ FvwmCommand -man_MANS = fvwm-menu-xlock.1 +man_MANS = fvwm-menu-xlock.1 fvwm-menu-directory.1 fvwm-perllib.1 LDADD = -L$(top_builddir)/libs $(X_LIBS) -lfvwm3 $(xpm_LIBS) $(Xcursor_LIBS) \ $(X_PRE_LIBS) -lXext -lX11 -lm $(X_EXTRA_LIBS) $(Xrender_LIBS) \ diff --git a/doc/Makefile.am b/doc/Makefile.am index 88d654048..921c79966 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,7 +2,7 @@ docdir = @FVWM_DOCDIR@ MODULE_ADOCS = $(wildcard fvwm3/fvwm3.adoc bin/*.adoc modules/*.adoc) man_MANS = $(patsubst %.adoc,%.1, $(MODULE_ADOCS)) -EXTRA_DISTS = $(man_MANS) +EXTRA_DIST = $(MODULE_ADOCS) if FVWM_BUILD_MANDOC BUILD_MANS = $(man_MANS) diff --git a/modules/FvwmConsole/Makefile.am b/modules/FvwmConsole/Makefile.am index e7e77a3c4..addb946c7 100644 --- a/modules/FvwmConsole/Makefile.am +++ b/modules/FvwmConsole/Makefile.am @@ -19,8 +19,6 @@ FvwmConsoleC_SOURCES = FvwmConsoleC.c FvwmConsole.h getline.c FvwmConsole_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a FvwmConsoleC_DEPENDENCIES = $(top_builddir)/libs/libfvwm3.a -EXTRA_DIST = FvwmConsoleC.pl.in Changes .fvwm2rc.sample - # Use X_EXTRA_LIBS to get socket(), etc. LDADD = -L$(top_builddir)/libs -lfvwm3 $(readline_LIBS) $(freetype_LIBS) \ $(X_EXTRA_LIBS)