Skip to content

Commit 6f2259f

Browse files
committed
build: override bundled libsemigroups install paths
Fixes: #1073
1 parent 61ec7aa commit 6f2259f

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

GNUmakefile.in

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#
22
# Makefile rules for the semigroups package
33
#
4+
abs_top_builddir = @abs_top_builddir@
5+
top_builddir = @top_builddir@
6+
abs_builddir = @abs_builddir@
7+
builddir = @builddir@
8+
49
KEXT_NAME = semigroups
510

611
KEXT_CXXFLAGS = @LIBSEMIGROUPS_CFLAGS@ -std=gnu++14 -O3
@@ -84,13 +89,13 @@ $(KEXT_OBJS): bin/include/libsemigroups/libsemigroups.hpp
8489

8590
# the following is only run if BUILT_SOURCES is wound up
8691
bin/include/libsemigroups/libsemigroups.hpp:
87-
$(MAKE) -C libsemigroups install
92+
$(MAKE) -C libsemigroups install prefix='${abs_builddir}/bin' includedir='${abs_builddir}/bin/include' libdir='${abs_builddir}/bin/lib'
8893
# Cygwin only looks for DLLs in the same directory as the executable
8994
# resides in. The following achieves that assuming that the GAP
9095
# being used was self-compiled by the user. This supports
9196
# both older GAPs with libtool (first) and GAP without libtool (second)
92-
if test -f bin/bin/cygsemigroups*.dll ; then if test -d $(GAPPATH)/.libs; then cp bin/bin/cygsemigroups*.dll $(GAPPATH)/.libs/ ; fi ; fi
93-
if test -f bin/bin/cygsemigroups*.dll ; then cp bin/bin/cygsemigroups*.dll $(GAPPATH)/ ; fi
97+
if test -f bin/lib/cygsemigroups*.dll ; then if test -d $(GAPPATH)/.libs; then cp bin/lib/cygsemigroups*.dll $(GAPPATH)/.libs/ ; fi ; fi
98+
if test -f bin/lib/cygsemigroups*.dll ; then cp bin/lib/cygsemigroups*.dll $(GAPPATH)/ ; fi
9499

95100
endif
96101

configure.ac

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ AC_CONFIG_MACRO_DIR([m4])
1616

1717
AX_PREFIX_CONFIG_H([src/semigroups-config.hpp],[semigroups],[gen/pkgconfig.h])
1818

19-
dnl ## abs_top_builddir seems to hold the top build dir for the subpackage
20-
dnl ## libsemigroups which is why this contains ../
21-
AC_PREFIX_DEFAULT('${abs_top_builddir}/../bin/')
22-
2319
dnl ##
2420
dnl ## Set the language
2521
dnl ##

0 commit comments

Comments
 (0)