summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--glusterfs.spec.in5
2 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 82175ee..1282c98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ dist-hook: gen-VERSION gen-ChangeLog
-rm -fr $(distdir)/contrib/argp-standalone/autom4te.cache
-rm -fr $(distdir)/contrib/argp-standalone/.deps
-rm -fr $(distdir)/contrib/umountd/.deps
+ -rm -fr $(distdir)/config.{guess,sub}
.PHONY: gen-VERSION gen-ChangeLog
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 1e5a812..36add2c 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -571,10 +571,7 @@ This package provides the translators needed on any GlusterFS client.
%setup -q -n %{name}-%{version}%{?prereltag}
%build
-# For whatever reason, install-sh is sometimes missing. When this gets fixed,
-# there is no need to run ./autogen or have a BuildRequires for automake.
-[ -e 'install-sh' -o -e 'install.sh' ] || ./autogen.sh
-%configure \
+./autogen.sh && %configure \
%{?_with_tmpfilesdir} \
%{?_without_rdma} \
%{?_without_epoll} \