Skip to content

Commit b921574

Browse files
committed
install: include generated config.{guess,sub} in dist
Include the lib/config.guess and lib/config.sub scripts in distribution tarball if generated by autoreconf
1 parent d6ff7dc commit b921574

File tree

5 files changed

+20
-5
lines changed

5 files changed

+20
-5
lines changed

.aspell.en.pws

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
personal_ws-1.1 en 801
1+
personal_ws-1.1 en 802
22
ABBRVLIST
33
ActiveTcl
44
Adrien
@@ -231,6 +231,7 @@ autoconf
231231
autoinit
232232
automake
233233
autopoint
234+
autoreconf
234235
availabilities
235236
avx
236237
backticks

Makefile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -630,17 +630,26 @@ endif
630630
rmdir $(DESTDIR)$(datarootdir)
631631
$(RMDIR_IGN_NON_EMPTY) $(DESTDIR)$(prefix) || true
632632

633+
# include config.{guess,sub} scripts in dist if generated by autoreconf
634+
ifeq ($(wildcard lib/config.guess),lib/config.guess)
635+
DIST_AUTORECONF_EXTRA += lib/config.guess
636+
endif
637+
ifeq ($(wildcard lib/config.sub),lib/config.sub)
638+
DIST_AUTORECONF_EXTRA += lib/config.sub
639+
endif
640+
633641
# include pre-generated documents not to require documentation build
634642
# tools when installing from dist tarball
635643
dist-tar: ChangeLog contrib/rpm/environment-modules.spec pkgdoc
636644
$(ECHO_GEN2) $(DIST_PREFIX).tar
637645
git archive --prefix=$(DIST_PREFIX)/ --worktree-attributes \
638646
-o $(DIST_PREFIX).tar HEAD
639647
tar -rf $(DIST_PREFIX).tar --transform 's,^,$(DIST_PREFIX)/,' \
640-
lib/configure lib/config.h.in ChangeLog doc/build/MIGRATING.txt \
641-
doc/build/changes.txt doc/build/INSTALL.txt doc/build/INSTALL-win.txt \
642-
doc/build/NEWS.txt doc/build/CONTRIBUTING.txt doc/build/module.1.in \
643-
doc/build/ml.1 doc/build/modulefile.4 contrib/rpm/environment-modules.spec
648+
lib/configure lib/config.h.in $(DIST_AUTORECONF_EXTRA) ChangeLog \
649+
doc/build/MIGRATING.txt doc/build/changes.txt doc/build/INSTALL.txt \
650+
doc/build/INSTALL-win.txt doc/build/NEWS.txt doc/build/CONTRIBUTING.txt \
651+
doc/build/module.1.in doc/build/ml.1 doc/build/modulefile.4 \
652+
contrib/rpm/environment-modules.spec
644653

645654
dist-gzip: dist-tar
646655
$(ECHO_GEN2) $(DIST_PREFIX).tar.gz

NEWS.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ Modules 5.1.1 (not yet released)
2828
requirements. (fix issue #459)
2929
* Update module designation with the tags set by reloading dependent module.
3030
(fix issue #460)
31+
* Install: include the ``lib/config.guess`` and ``lib/config.sub`` scripts in
32+
distribution tarball if generated by :command:`autoreconf`.
3133

3234

3335
Modules 5.1.0 (2022-04-30)

lib/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
/Makefile
22
/autom4te.cache
3+
/config.guess
34
/config.h
45
/config.h.in
56
/config.log
67
/config.status
8+
/config.sub
79
/configure
810
/envmodules.o
911
/libtclenvmodules.so

lib/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ distclean: clean
8989
ifeq ($(wildcard ../.git),../.git)
9090
rm configure
9191
rm config.h.in
92+
rm -f config.guess config.sub
9293
ifeq ($(wildcard autom4te.cache),autom4te.cache)
9394
rm -f autom4te.cache/*
9495
rmdir autom4te.cache

0 commit comments

Comments
 (0)