commit 0bc351e26d0dc375d9edb78996152cf8d5cd86a9
Author: Egor <egor@opensrc.club>
AuthorDate: Sat Apr 8 17:54:40 2023 +0300
Commit: Egor <egor@opensrc.club>
CommitDate: Sat Apr 8 17:54:40 2023 +0300
Fix automake distcheck issues
There were three issues:
1) INSTALL target in the top-level makefile didn't use srcdir.
2) server.template and setup.template weren't included in the tarball.
3) metainfo.xml files weren't deleted by make clean.
---
Makefile.am | 4 ++--
man/Makefile.am | 4 +++-
src/Makefile.am | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 278bc5a3..5d9ce226 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,9 +54,9 @@ DIST_SUBDIRS=pkg $(SUBDIRS)
if HAVE_DOC
INSTALL : man/INSTALL.template man/simplecpp
- ./man/simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \
+ $(srcdir)/man/simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \
-DLONG_GAME_NAME="@PACKAGE_SHORTNAME@ Doom" \
-DLONG_EXE_NAME="@PROGRAM_PREFIX@doom" \
- < man/INSTALL.template > $@
+ < $(srcdir)/man/INSTALL.template > $@
endif
diff --git a/man/Makefile.am b/man/Makefile.am
index 5a886fc9..66567e07 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -8,7 +8,9 @@ MANPAGE_GEN_FILES = environ.man \
strife.template \
docgen \
default.cfg.template \
- extra.cfg.template
+ extra.cfg.template \
+ server.template \
+ setup.template
doomdocsdir = ${docdir}/../${PROGRAM_PREFIX}doom
hereticdocsdir = ${docdir}/../${PROGRAM_PREFIX}heretic
diff --git a/src/Makefile.am b/src/Makefile.am
index 06f4827e..3d964645 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -277,7 +277,7 @@ screensaver_DATA = @PACKAGE_RDNS@.Doom_Screensaver.desktop
@PACKAGE_RDNS@.Doom_Screensaver.desktop: Doom_Screensaver.desktop
cp Doom_Screensaver.desktop $@
-CLEANFILES = $(execgames_SCRIPTS) $(app_DATA) $(screensaver_DATA)
+CLEANFILES = $(execgames_SCRIPTS) $(metainfo_DATA) $(app_DATA) $(screensaver_DATA)
.rc.o:
$(WINDRES) $< -o $@