Browse Source

build: update Makefile to avoid godep warning

fatedier 9 years ago
parent
commit
7c3e00ed28
3 changed files with 9 additions and 9 deletions
  1. 5 5
      Makefile
  2. 2 2
      conf/frpc.ini
  3. 2 2
      conf/frps.ini

+ 5 - 5
Makefile

@@ -1,5 +1,5 @@
 export PATH := $(GOPATH)/bin:$(PATH)
-export NEW_GOPATH := $(shell pwd)
+export GOPATH := $(shell pwd):$(GOPATH)
 
 all: build
 
@@ -9,13 +9,13 @@ godep:
 	@go get github.com/tools/godep
 
 fmt:
-	GOPATH=$(NEW_GOPATH) godep go fmt ./...
+	godep go fmt ./...
 
 frps:
-	GOPATH=$(NEW_GOPATH) godep go build -o bin/frps ./src/frp/cmd/frps
+	godep go build -o bin/frps ./src/frp/cmd/frps
 
 frpc:
-	GOPATH=$(NEW_GOPATH) godep go build -o bin/frpc ./src/frp/cmd/frpc
+	godep go build -o bin/frpc ./src/frp/cmd/frpc
 
 test:
-	@GOPATH=$(NEW_GOPATH) godep go test -v ./...
+	godep go test -v ./...

+ 2 - 2
conf/frpc.ini

@@ -3,9 +3,9 @@
 server_addr = 0.0.0.0
 server_port = 7000
 # console or real logFile path like ./frpc.log
-log_file = console
+log_file = ./frpc.log
 # debug, info, warn, error
-log_level = debug
+log_level = info
 # for authentication
 auth_token = 123
 

+ 2 - 2
conf/frps.ini

@@ -3,9 +3,9 @@
 bind_addr = 0.0.0.0
 bind_port = 7000
 # console or real logFile path like ./frps.log
-log_file = console
+log_file = ./frps.log
 # debug, info, warn, error
-log_level = debug
+log_level = info
 
 # test1 is the proxy name, client will use this name and auth_token to connect to server
 [test1]