* Incorporated generation of version.go into Makefile and dropped version.sh.

diff --git a/Makefile b/Makefile
index 7e8bded6c448b19bc8f681cef9fe724be70430b9..f4c8757db7a7b0c3e8069eb12127a7b76e673cfe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,17 +4,14 @@
 
 PROJECT := gogopherd
 
-GOBLD   := go build
-SH      := /bin/sh
-
-GETVER  := version.sh
-VERFILE := version.go
-
-
 BIN     := $(PROJECT)
 SRC     := $(wildcard *.go)
 SELF    := $(lastword $(MAKEFILE_LIST))
 
+VERSION := $(strip $(shell git describe 2> /dev/null))
+VERFILE := version.go
+
+GOBLD   := go build
 
 .PHONY: all version clean distclean
 
@@ -24,14 +21,16 @@ $(BIN): $(SRC) $(SELF)
        $(GOBLD) $(SRVSRC)
 
 version:
-       $(SH) $(GETVER) $(VERFILE)
+       @echo "generate version.go"
+       @echo "package main" > $(VERFILE)
+       @echo "" >> $(VERFILE)
+       @echo "const version = \"$(VERSION)\"" >> $(VERFILE)
 
 clean:
        $(RM) $(BIN) $(VERFILE)
 
 distclean: clean
 
-
 ###########
 ##  EOF  ##
 ###########

diff --git a/version.sh b/version.sh
deleted file mode 100644 (file)
index 50007cc..0000000
--- a/version.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-VERSION=`git describe`
-echo "package main" > "$1"
-echo "const version = \"$VERSION\"" >> "$1"