[gentoo-commits] proj/ufed:master commit in: /

["David Seifert" <soap@gentoo.org>]

commit:     42f34212fed44f783da8af3d9deb230dbef9fa9f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 13:56:33 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 13:56:33 2019 +0000
URL:        https://gitweb.gentoo.org/proj/ufed.git/commit/?id=42f34212

Fix `make distcheck`

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 Makefile.am  | 14 ++++++--------
 configure.ac |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f8f5999..3cc209d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,27 +20,25 @@ noinst_HEADERS = \
 	ufed-curses-globals.h \
 	ufed-curses-help.h \
 	ufed-curses-types.h
-	
-dist_man_MANS = ufed.8
+
+man_MANS = ufed.8
 EXTRA_DIST = ufed.pl.in ufed.8.in
 
+CLEANFILES = $(sbin_SCRIPTS) $(man_MANS)
+
 ufed: $(top_srcdir)/ufed.pl.in
-	cd $(top_srcdir) && \
 	rm -f ufed.tmp && \
 	$(SED) \
 		-e 's|XX_PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \
 		-e 's|XX_PERL[@]|$(PERL)|g' \
 		-e 's|XX_pkglibexecdir[@]|$(pkglibexecdir)|g' \
 		-e 's|XX_perldir[@]|$(perldir)|g' \
-		ufed.pl.in >ufed.tmp && \
-	chmod +x ufed.tmp && \
+		$(top_srcdir)/ufed.pl.in >ufed.tmp && \
 	mv ufed.tmp ufed
 
 ufed.8: $(top_srcdir)/ufed.8.in
-	cd $(top_srcdir) && \
 	rm -f ufed.8.tmp && \
 	$(SED) \
 		-e 's|@GENTOO_PORTAGE_EPREFIX@|$(E_PREFIX)|g' \
-		ufed.8.in >ufed.8.tmp && \
-	chmod +x ufed.8.tmp && \
+		$(top_srcdir)/ufed.8.in >ufed.8.tmp && \
 	mv ufed.8.tmp ufed.8

diff --git a/configure.ac b/configure.ac
index 736d06a..a8eda7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.69])
 AC_INIT([ufed],[git],[https://bugs.gentoo.org/])
-AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_INIT_AUTOMAKE([1.14 -Wall foreign dist-bzip2 no-dist-gzip subdir-objects])
 AC_CONFIG_SRCDIR([ufed-curses.c])
 AC_CONFIG_HEADERS([config.h])