diff options
| author | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2019-04-16 14:27:18 +0200 |
|---|---|---|
| committer | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2021-03-18 08:40:35 +0100 |
| commit | 3cb08041ab29c379e4b54dc092818b0dbfa044da (patch) | |
| tree | aeb5d5a120cbee3a91a84fefd030b684e70f39fa | |
| parent | c854e0f84a40d972cbd532bbb89c97ca0126a7cf (diff) | |
Cater for guile 2.2, 3.0.
* Makefile.am (godir, moddir): Softcode effective version.
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | guix.scm | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 44c0cbb..0924e72 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,6 @@ # guile-websocket --- WebSocket client/server # Copyright © 2015 David Thompson <davet@gnu.org> +# Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> # # This file is part of guile-websocket. # @@ -37,8 +38,8 @@ SUFFIXES = .scm .go .scm.go: $(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<" -moddir=$(prefix)/share/guile/site/2.0 -godir=$(libdir)/guile/2.0/ccache +moddir=$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION) +godir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache SOURCES = \ web/socket/base64.scm \ diff --git a/configure.ac b/configure.ac index 8d32ce2..d49fef1 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,7 @@ # # guile-websocket --- WebSocket client/server # Copyright © 2015 David Thompson <davet@gnu.org> +# Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> # # This file is part of guile-websocket. # @@ -28,6 +29,8 @@ AM_SILENT_RULES([yes]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env]) -GUILE_PROGS([2.0.9]) +GUILE_PKG([3.0 2.2 2.0.9]) +GUILE_PROGS +GUILE_SITE_DIR AC_OUTPUT @@ -1,5 +1,6 @@ ;;; guile-websocket --- WebSocket client/server ;;; Copyright © 2015 David Thompson <davet@gnu.org> +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>;;; ;;; ;;; This file is part of guile-websocket. ;;; @@ -39,6 +40,7 @@ (guix build-system gnu) (gnu packages) (gnu packages autotools) + (gnu packages pkg-config) (gnu packages guile)) (package @@ -61,7 +63,8 @@ (lambda _ (zero? (system* "sh" "bootstrap"))))))) (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake))) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.0))) (synopsis "Websocket server/client for Guile") |