aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xconfigure2
-rw-r--r--configure.scm7
3 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index aed14f2..d9c6c67 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,6 @@
# License along with kolam. If not, see
# <http://www.gnu.org/licenses/>.
-project = kolam
-
include Makefile.include
GUILE = guile
diff --git a/configure b/configure
index 25eeb93..af1791d 100755
--- a/configure
+++ b/configure
@@ -19,4 +19,4 @@
# License along with kolam. If not, see
# <http://www.gnu.org/licenses/>.
-guile --no-auto-compile configure.scm "$@"
+guile --no-auto-compile configure.scm kolam "$@"
diff --git a/configure.scm b/configure.scm
index 6681f17..07a822a 100644
--- a/configure.scm
+++ b/configure.scm
@@ -56,7 +56,7 @@
(define processed-args
(match (program-arguments)
- ((_ args ...)
+ ((_ project args ...)
(let* ((args (args-fold args
(list (option '("prefix") #t #f
option-proc))
@@ -71,7 +71,8 @@
(string-append exec-prefix "/lib")))
(datarootdir (or (assq-ref args 'datarootdir)
(string-append prefix "/share"))))
- `((libdir . ,libdir)
+ `((project . ,project)
+ (libdir . ,libdir)
(datarootdir . ,datarootdir))))))
(check-for-guile-3.0)
@@ -81,10 +82,12 @@
(lambda (port)
(display (format "# This file was automatically generated by configure.
+project = ~a
libdir = ~a
datarootdir = ~a
guile_effective_version = ~a
"
+ (assq-ref processed-args 'project)
(assq-ref processed-args 'libdir)
(assq-ref processed-args 'datarootdir)
(effective-version))