From 4ff9715646da02ba468cb25fcf0e6a5c1e27ba79 Mon Sep 17 00:00:00 2001 From: Chris Jefferson Date: Wed, 24 Jan 2024 00:04:11 +0800 Subject: [PATCH] Support GAP on Cygwin with libtool removed --- GNUmakefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 52cb68709..ca33508df 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -86,9 +86,10 @@ bin/include/libsemigroups/libsemigroups.hpp: $(MAKE) -C libsemigroups install # Cygwin only looks for DLLs in the same directory as the executable # resides in. The following achieves that assuming that the GAP - # being used was self-compiled by the user. If the GAP build system - # changes to stop using GNU libtool, this will have to be adjusted. - if test -f bin/bin/cygsemigroups*.dll ; then cp bin/bin/cygsemigroups*.dll $(GAPPATH)/.libs ; fi + # being used was self-compiled by the user. This supports + # both older GAPs with libtool (first) and GAP without libtool (second) + if test -f bin/bin/cygsemigroups*.dll ; then if test -d $(GAPPATH)/.libs; then cp bin/bin/cygsemigroups*.dll $(GAPPATH)/.libs/ ; fi ; fi + if test -f bin/bin/cygsemigroups*.dll ; then cp bin/bin/cygsemigroups*.dll $(GAPPATH)/ ; fi endif