File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 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+
49KEXT_NAME = semigroups
510
611KEXT_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
8691bin/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
95100endif
96101
Original file line number Diff line number Diff line change @@ -16,10 +16,6 @@ AC_CONFIG_MACRO_DIR([m4])
1616
1717AX_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-
2319dnl ##
2420dnl ## Set the language
2521dnl ##
You can’t perform that action at this time.
0 commit comments