diff options
| author | Niels de Vos <ndevos@redhat.com> | 2016-05-23 11:06:38 +0200 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-05-24 07:10:52 -0700 |
| commit | b00eb38bff09b3fec6a273b7cb84cee3fa581a0d (patch) | |
| tree | b64aa7ab76f22584372ee0ea565d6a686172b571 /Makefile.am | |
| parent | 5fa5ec2aa6faf2a564443d8e2a88cad473f37d30 (diff) | |
build: include a dummy config.sub and config.guess in releases
There is no hard requirement for a config.guess and config.sub script in
the release tarball. By passing --build=... and --host=... to
./configure, the scripts are not executed. When doing local builds, the
./autogen.sh script (by running automake) will place a config.guess and
config.sub script in the root of the source tree. Upon creation of the
release ('make dist') tarball, the scripts are replaced by dummy copies
from the build-aux/ directory.
The main advantage to not include these scripts in the repository, is
that there is no need to track upstream updates for them either.
Cherry picked from commit bfd43dc894fcf2cc64ec73e8ea0a779064c47dd4:
> Change-Id: I5e930988a9e849ec5d0c84d2e30e61f2a9685f45
> BUG: 1223937
> Reported-by: Emmanuel Dreyfus <manu@netbsd.org>
> Signed-off-by: Niels de Vos <ndevos@redhat.com>
> Reviewed-on: http://review.gluster.org/14503
> Smoke: Gluster Build System <jenkins@build.gluster.com>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Change-Id: I5e930988a9e849ec5d0c84d2e30e61f2a9685f45
BUG: 1339192
Reported-by: Emmanuel Dreyfus <manu@netbsd.org>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/14517
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 1201ca2319b..d36f53055ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,8 @@ 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} + -cp -f $(top_srcdir)/build-aux/config.sub.dist $(distdir)/config.sub + -cp -f $(top_srcdir)/build-aux/config.guess.dist $(distdir)/config.guess .PHONY: gen-VERSION gen-ChangeLog |