diff options
| author | Fredrik Salomonsson <plattfot@posteo.net> | 2021-01-30 17:15:25 -0800 |
|---|---|---|
| committer | Fredrik Salomonsson <plattfot@posteo.net> | 2021-01-31 15:33:24 -0800 |
| commit | d14f35dd8eddfacdab6380e1e36f73b1c5355270 (patch) | |
| tree | 6c40455ba5dc01d4b93d28946e9370f4f06451ea | |
| parent | ee0a2d186d50d838da46858f982b2c81e9a6b17c (diff) | |
| download | pinentry-rofi-d14f35dd8eddfacdab6380e1e36f73b1c5355270.tar.gz | |
Fix the issue with the error "no code for module (pinentry-rofi)"
Update the autoconf and automake to compute the relative path to the
module and object path.
This adds a dependency on autoconf-archive for computing the relative
paths.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | guix.scm | 1 | ||||
| -rw-r--r-- | scripts/pinentry-rofi.in | 6 |
4 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index d499bf6..f6eeea3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,8 @@ do_subst = $(SED) \ -e 's,[@]GUILE[@],$(GUILE),g' \ -e 's,[@]guilemoduledir[@],$(guilemoduledir),g' \ -e 's,[@]guileobjectdir[@],$(guileobjectdir),g' \ + -e 's,[@]GUILE_OBJECT_DIR[@],$(prefix)/$(GUILE_OBJECT_DIR),g' \ + -e 's,[@]GUILE_MODULE_DIR[@],$(exec_prefix)/$(GUILE_MODULE_DIR),g' \ -e 's,[@]localedir[@],$(localedir),g' nodist_noinst_SCRIPTS = pre-inst-env diff --git a/configure.ac b/configure.ac index a5ba0de..50bcd4b 100644 --- a/configure.ac +++ b/configure.ac @@ -32,4 +32,9 @@ guileobjectdir="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache" AC_SUBST([guilemoduledir]) AC_SUBST([guileobjectdir]) +AX_COMPUTE_RELATIVE_PATHS([bindir:guilemoduledir:GUILE_MODULE_DIR bindir:guileobjectdir:GUILE_OBJECT_DIR]) + +AC_SUBST([GUILE_MODULE_DIR]) +AC_SUBST([GUILE_OBJECT_DIR]) + AC_OUTPUT @@ -60,6 +60,7 @@ #t)))))))) (native-inputs `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) ("automake" ,automake) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) diff --git a/scripts/pinentry-rofi.in b/scripts/pinentry-rofi.in index 60c1e79..d7c0d16 100644 --- a/scripts/pinentry-rofi.in +++ b/scripts/pinentry-rofi.in @@ -24,8 +24,10 @@ ;; THE SOFTWARE. (eval-when (load expand eval) - (set! %load-path (cons "@guilemoduledir@" %load-path)) - (set! %load-compiled-path (cons "@guileobjectdir@" %load-compiled-path))) + (set! %load-path + (cons (format #f "~a/@GUILE_MODULE_DIR@" (dirname (current-filename))) %load-path)) + (set! %load-compiled-path + (cons (format #f "~a/@GUILE_OBJECT_DIR@" (dirname (current-filename))) %load-compiled-path))) (use-modules (ice-9 getopt-long) (ice-9 format) |