From b6b93f9f192ff2743f9453bdd93b0ea5782a55d5 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 12 Jun 2018 07:05:33 +0200
Subject: [PATCH] build: Resurrect non-bootstrap build.

* configure (parse-opts): Support mixing VAR=VALUE --prefix=PREFIX.
* guix.scm (mes): Remove setting PREFIX in make-flags.
* install.sh: Cater for Guix's setting read-only of scripts/diff.scm.
---
 build-aux/build-guile.sh | 2 ++
 configure                | 2 +-
 guix.scm                 | 4 +---
 install.sh               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-aux/build-guile.sh b/build-aux/build-guile.sh
index 75e826cc..f04c2097 100755
--- a/build-aux/build-guile.sh
+++ b/build-aux/build-guile.sh
@@ -23,8 +23,10 @@ if [ -n "$BUILD_DEBUG" ]; then
 fi
 
 export GUILE
+export GUILE_AUTO_COMPILE
 GUILE=${GUILE-$(command -v guile)}
 GUILE_TOOLS=${GUILE_TOOLS-$(command -v guile-tools)}
+GUILE_AUTO_COMPILE=0
 
 set -e
 
diff --git a/configure b/configure
index 81b18a63..aa4ea513 100755
--- a/configure
+++ b/configure
@@ -191,7 +191,7 @@ exec ${GUILE-guile} -L . --no-auto-compile -e '(configure)' -s "$0" ${1+"$@"}
             (with-courage)
             ;;ignore
             (enable-fast-install))))
-    (getopt-long args option-spec #:stop-at-first-non-option #t)))
+    (getopt-long args option-spec)))
 
 (define* (print-help #:optional (port (current-output-port)))
   (format port "\
diff --git a/guix.scm b/guix.scm
index 3e61b7dd..0d45dd2b 100644
--- a/guix.scm
+++ b/guix.scm
@@ -159,9 +159,7 @@ hex2 linker.")
                '())
          ("perl" ,perl)))               ;build-aux/gitlog-to-changelog
       (arguments
-       `(#:make-flags (list
-                       (string-append "PREFIX=" (assoc-ref %outputs "out")))
-         #:phases
+       `(#:phases
          (modify-phases %standard-phases
            (add-before 'build 'make-git-source-writable
            (lambda* (#:key outputs #:allow-other-keys)
diff --git a/install.sh b/install.sh
index 6304adb5..112807bc 100755
--- a/install.sh
+++ b/install.sh
@@ -52,7 +52,7 @@ sed \
     -e "s,@VERSION@,$VERSION,g" \
     module/mes/boot-0.scm > $MODULEDIR/mes/boot-0.scm
 
-cp scripts/diff.scm $PREFIX/bin/diff.scm
 sed \
     -e "s,^#! /bin/sh,#! $SHELL," \
     scripts/diff.scm > $PREFIX/bin/diff.scm
+chmod -w+x $PREFIX/bin/diff.scm