change (opt"quicklisp") value

This commit is contained in:
SANO Masatoshi 2017-07-09 04:14:22 +09:00
parent 9c82d4aa69
commit dca9bf80fd
8 changed files with 8 additions and 8 deletions

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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);

View file

@ -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));

View file

@ -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_;

View file

@ -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);