From 4a6a353d1284299e11226c78bf782aa488913d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Tue, 4 Aug 2020 11:15:42 +0200 Subject: Fix make install for tzget. --- Makefile | 1 + configure | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 00cbc560..44c9cade 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ install: install -d $(DESTDIR)/usr/share/calp/www rsync -a static $(DESTDIR)/usr/share/calp/www # TODO main, tzget + @env CACHE_DIR=$(DESTDIR)/var/cache/calp/ ./tzget README: README.in ./main text < README.in | sed "s/<>/`date -I`/" > README diff --git a/configure b/configure index 30a78a24..79bd713b 100755 --- a/configure +++ b/configure @@ -17,9 +17,15 @@ ;; when zoneinfo (use-modules (ice-9 rdelim)) +(define *develop* #t) + +(define PREFIX //) +(define CACHE_DIR (string-append PREFIX // "var/cache/calp")) +(define LIBEXEC (if *develop* here (string-append PREFIX // "usr/lib/calp")) + (define pipe - (-> here - (string-append "/tzget") + (-> LIBEXEC + (string-append // "tzget") ((@ (ice-9 popen) open-input-pipe)))) (define path (read-line pipe)) (define names (string-split (read-line pipe) #\space)) -- cgit v1.2.3