diff --git a/app/mk/inc/config b/app/mk/inc/config index f22b329..a20b4f4 100644 --- a/app/mk/inc/config +++ b/app/mk/inc/config @@ -6,7 +6,6 @@ EXEDIR = $(HOME)/exe APPDIR = $(HOME)/app SHRDIR = $(HOME)/shr INCDIR = $SHRDIR/inc -MKINCDIR = $APPDIR/mk/inc OBJDIR = $SHRDIR/obj MANDIR = $SHRDIR/man INSTALLDIRS = $OBJDIR $MANDIR $EXEDIR $INCDIR $APPDIR diff --git a/app/mk/inc/std/gobuild b/app/mk/inc/std/gobuild index 51a2413..3e64951 100644 --- a/app/mk/inc/std/gobuild +++ b/app/mk/inc/std/gobuild @@ -26,7 +26,7 @@ build-sh :VQ: fi command cd $pwd done -clean:V: +clean:VQ: pwd=`pwd` names=`command cd src/cmd && goblin ls && command cd $pwd` for name in $names ; do diff --git a/install.sh b/install.sh index 4887a72..08150a8 100755 --- a/install.sh +++ b/install.sh @@ -2,7 +2,7 @@ wd=`pwd` -cd src/cmd/goblin && go install && cd $wd +cd src/cmd/goblin && go install&& cd $wd mkdir -p $HOME/app/goblin cp -rf app/* $HOME/app/goblin diff --git a/src/tool/mk/main.go b/src/tool/mk/main.go index 6f4f47b..bbac90e 100644 --- a/src/tool/mk/main.go +++ b/src/tool/mk/main.go @@ -326,9 +326,11 @@ func Run(args []string) { arg0 := args[0] args = args[1:] - if mkincdir := os.Getenv("MKINCDIR") ; mkincdir == "" { + if mkincdir := os.Getenv("MKINCDIR") ; + mkincdir == "" { homeDir, _ := os.UserHomeDir() os.Setenv("MKINCDIR", homeDir + "/app/goblin/mk/inc" ) + fmt.Println("shit:", os.Getenv("MKINCDIR")) } flags := flag.NewFlagSet(arg0, flag.ExitOnError)