>From a70bb89cc2d9fd0a40437b01a2f1813ddf5072a6 Mon Sep 17 00:00:00 2001
From: Evan Hanson <address@hidden>
Date: Wed, 29 Aug 2018 09:04:58 +1200
Subject: [PATCH 3/3] Rename the "-no-install-deps" option to
 "-no-install-dependencies"

---
 chicken-install.mdoc   |  2 +-
 chicken-install.scm    | 20 ++++++++++----------
 manual/Extension tools |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/chicken-install.mdoc b/chicken-install.mdoc
index 773cd42d..284e74fc 100644
--- a/chicken-install.mdoc
+++ b/chicken-install.mdoc
@@ -80,7 +80,7 @@ When cross-compiling, only compile extensions for target.
 Run included test cases, if available.
 .It Fl n , Fl no-install
 Do not install the egg, just build it.
-.It Fl no-install-deps
+.It Fl no-install-dependencies
 Do not install dependencies. Note that this option may result in build
 failures due to missing extension libraries.
 .It Fl u , Fl update-db
diff --git a/chicken-install.scm b/chicken-install.scm
index fd50e5ec..902a2862 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -80,6 +80,7 @@
 (define retrieve-recursive #f)
 (define do-not-build #f)
 (define no-install #f)
+(define no-install-dependencies #f)
 (define list-versions-only #f)
 (define canonical-eggs '())
 (define requested-eggs '())
@@ -95,7 +96,6 @@
 (define purge-mode #f)
 (define keepfiles #f)
 (define print-repository #f)
-(define no-deps #f)
 (define cached-only #f)
   
 (define platform
@@ -824,7 +824,7 @@
                     (else
                       (print "building " name)
                       (run-script dir bscript platform)
-                      (unless (if (member name requested-eggs) no-install no-deps)
+                      (unless (if (member name requested-eggs) no-install no-install-dependencies)
                         (print "  installing " name)
                         (run-script dir iscript platform sudo: sudo-install))
                       (when (and (member name requested-eggs)
@@ -854,7 +854,7 @@
                     (else
                       (print "building " name " (target)")
                       (run-script dir bscript platform)
-                      (unless (if (member name requested-eggs) no-install no-deps)
+                      (unless (if (member name requested-eggs) no-install no-install-dependencies)
                         (print "  installing " name " (target)")
                         (run-script dir iscript platform)))))))))
     (order-installed-eggs)))
@@ -1027,8 +1027,8 @@ usage: chicken-install [OPTION ...] [NAME[:VERSION] ...]
                                 build & install scripts
        -list-versions           list available versions for given eggs (HTTP transport only)
   -n   -no-install              do not install, just build (giving -n more than once implies
-                                `-no-install-deps')
-       -no-install-deps         do not install dependencies
+                                `-no-install-dependencies')
+       -no-install-dependencies do not install dependencies
        -purge                   remove cached files for given eggs (or purge cache completely)
        -host                    when cross-compiling, compile extension only for host
        -target                  when cross-compiling, compile extension only for target
@@ -1098,8 +1098,8 @@ EOF
                   ((member arg '("-u" "-update-db"))
                    (set! update-module-db #t)
                    (loop (cdr args)))
-                  ((equal? arg "-no-install-deps")
-                   (set! no-deps #t)
+                  ((equal? arg "-no-install-dependencies")
+                   (set! no-install-dependencies #t)
                    (loop (cdr args)))
                   ((equal? arg "-dry-run")
                    (set! do-not-build #t)
@@ -1115,14 +1115,14 @@ EOF
                    (loop (cdr args)))
                   ((equal? arg "-n")
                    (if no-install
-                       (set! no-deps #t)
+                       (set! no-install-dependencies #t)
                        (set! no-install #t))
                    (loop (cdr args)))
                   ((equal? arg "-no-install")
                    (set! no-install #t)
                    (loop (cdr args)))
-                  ((equal? arg "-no-install-deps")
-                   (set! no-deps #t)
+                  ((equal? arg "-no-install-dependencies")
+                   (set! no-install-dependencies #t)
                    (loop (cdr args)))
                   ((equal? arg "-purge")
                    (set! purge-mode #t)
diff --git a/manual/Extension tools b/manual/Extension tools
index 8804cefa..d747cd70 100644
--- a/manual/Extension tools	
+++ b/manual/Extension tools	
@@ -216,7 +216,7 @@ Available options:
 ; {{-force}} : don't ask, install even if versions don't match
 ; {{-k   -keep}} : keep temporary files
 ; {{-s   -sudo}} : use external command to elevate privileges when installing or removing files
-; {{-no-install-deps}} : do not install dependencies
+; {{-no-install-dependencies}} : do not install dependencies
 ; {{-r   -retrieve}} : only retrieve egg into current directory, don't install (giving -r more than once implies {{-recursive}})
 ; {{-recursive}} : if {{-retrieve}} is given, retrieve also dependencies
 ; {{-dry-run}} :  do not build or install, just print the locations of the generated build + install scripts
-- 
2.11.0