From dca9bf80fdc375fcff38730c78d2a9eeb7e45847 Mon Sep 17 00:00:00 2001
From: SANO Masatoshi <snmsts@gmail.com>
Date: Sun, 9 Jul 2017 04:14:22 +0900
Subject: [PATCH] change (opt"quicklisp") value

---
 src/cmd-run-acl.c   | 2 +-
 src/cmd-run-ccl.c   | 2 +-
 src/cmd-run-clisp.c | 2 +-
 src/cmd-run-cmu.c   | 2 +-
 src/cmd-run-sbcl.c  | 2 +-
 src/cmd-run.c       | 2 +-
 src/util-dir.c      | 2 +-
 src/util.h          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cmd-run-acl.c b/src/cmd-run-acl.c
index 2fb4e65..042dffc 100644
--- a/src/cmd-run-acl.c
+++ b/src/cmd-run-acl.c
@@ -34,7 +34,7 @@ char** cmd_run_acl(int argc,char** argv,struct sub_command* cmd) {
   }
 
   if(image) {
-    char *path=cat(dumpbasedir(),impl_path,SLASH,"dump",SLASH,image,".core",NULL);
+    char *path=cat(basedir(),impl_path,SLASH,"dump",SLASH,image,".core",NULL);
     if(file_exist_p(path)) {
       ret=conss(q("-I"),ret);
       ret=conss(path,ret);
diff --git a/src/cmd-run-ccl.c b/src/cmd-run-ccl.c
index ede894d..c96740c 100644
--- a/src/cmd-run-ccl.c
+++ b/src/cmd-run-ccl.c
@@ -62,7 +62,7 @@ char** cmd_run_ccl(int argc,char** argv,struct sub_command* cmd) {
     if(!issystem)
       ret=conss(cat(home,impl_path,SLASH,binname,".image",NULL),ret);
   }else
-    ret=conss(cat(dumpbasedir(),impl_path,SLASH,"dump",SLASH,image,".",binname,NULL),ret);
+    ret=conss(cat(basedir(),impl_path,SLASH,"dump",SLASH,image,".",binname,NULL),ret);
 
   ret=conss(q("--eval"),ret);
   ret=conss(s_cat(q("(progn #-ros.init(cl:load \""),lispdir(),q("init.lisp"),q("\"))"),NULL),ret);
diff --git a/src/cmd-run-clisp.c b/src/cmd-run-clisp.c
index fbe9073..106e6c6 100644
--- a/src/cmd-run-clisp.c
+++ b/src/cmd-run-clisp.c
@@ -37,7 +37,7 @@ char** cmd_run_clisp(int argc,char** argv,struct sub_command* cmd) {
     ret=conss(q("--help"),ret);
 
   if(image) {
-    char *path=cat(dumpbasedir(),impl_path,SLASH,"dump",SLASH,image,".core",NULL);
+    char *path=cat(basedir(),impl_path,SLASH,"dump",SLASH,image,".core",NULL);
     if(file_exist_p(path)) {
       ret=conss(q("-M"),ret);
       ret=conss(path,ret);
diff --git a/src/cmd-run-cmu.c b/src/cmd-run-cmu.c
index 72df039..eb0d2fe 100644
--- a/src/cmd-run-cmu.c
+++ b/src/cmd-run-cmu.c
@@ -40,7 +40,7 @@ char** cmd_run_cmu(int argc,char** argv,struct sub_command* cmd) {
 
   ret=conss(q("-quiet"),ret);
   if(image) {
-    char *path=cat(dumpbasedir(),impl_path,SLASH,"dump",SLASH,image,".core",NULL);
+    char *path=cat(basedir(),impl_path,SLASH,"dump",SLASH,image,".core",NULL);
     if(file_exist_p(path)) {
       ret=conss(q("-core"),ret);
       ret=conss(q(path),ret);
diff --git a/src/cmd-run-sbcl.c b/src/cmd-run-sbcl.c
index 82cad87..dd7036b 100644
--- a/src/cmd-run-sbcl.c
+++ b/src/cmd-run-sbcl.c
@@ -35,7 +35,7 @@ char** cmd_run_sbcl(int argc,char** argv,struct sub_command* cmd) {
   /* runtime options from here */
   if(image) {
     char* ld=lispdir();
-    char* base=dumpbasedir();
+    char* base=basedir();
     char* bindir=cat(base,"bin"SLASH,NULL);
     char* script2=q(script?script+1:"");
     int pos= position_char("\"",script2);
diff --git a/src/cmd-run.c b/src/cmd-run.c
index 884eea2..3bd0249 100644
--- a/src/cmd-run.c
+++ b/src/cmd-run.c
@@ -94,7 +94,7 @@ void star_set_opt(void) {
   char*lisp=get_opt("lisp",1);
   lisp=lisp?lisp:get_opt("*lisp",0);
   set_opt(&local_opt,"impl",determin_impl(lisp));
-  set_opt(&local_opt,"quicklisp",s_escape_string(cat(config,"lisp",SLASH,"quicklisp",SLASH,NULL)));
+  set_opt(&local_opt,"quicklisp",s_escape_string(cat(basedir(),"lisp",SLASH,"quicklisp",SLASH,NULL)));
   set_opt(&local_opt,"argv0",argv_orig[0]);
   set_opt(&local_opt,"wargv0",which(argv_orig[0]));
   set_opt(&local_opt,"homedir",q(config));
diff --git a/src/util-dir.c b/src/util-dir.c
index 1855373..cb1749f 100644
--- a/src/util-dir.c
+++ b/src/util-dir.c
@@ -109,7 +109,7 @@ char* impldir(char* arch,char* os,char* impl,char* version) {
   return cat("impls",SLASH,arch,SLASH,os,SLASH,impl,SLASH,version,NULL);
 }
 
-char* dumpbasedir(void) {
+char* basedir(void) {
   char* cd_ = s_cat2(currentdir(),q("."PACKAGE SLASH));
   if(directory_exist_p(cd_))
     return cd_;
diff --git a/src/util.h b/src/util.h
index cf06f59..66a9592 100644
--- a/src/util.h
+++ b/src/util.h
@@ -128,7 +128,7 @@ char* escape_string(char* str);
 char* s_escape_string(char* str);
 char* lispdir(void);
 /*util_dir.c */
-char* dumpbasedir(void);
+char* basedir(void);
 char* configdir(void);
 char* subcmddir(void);
 char* truename(const char* path);