Merge pull request #938 from robey/master

create a unix-style tarball with a nested folder

Makefile

@@ -36,7 +36,10 @@ docker:
 tarball: $(ARCHIVE)
 
 $(ARCHIVE): build
-	tar -czf $(ARCHIVE) prometheus promtool consoles console_libraries
+	mkdir -p $(ARCHIVEDIR)
+	cp -a prometheus promtool consoles console_libraries $(ARCHIVEDIR)
+	tar -czf $(ARCHIVE) $(ARCHIVEDIR)
+	rm -rf $(ARCHIVEDIR)
 
 release: REMOTE     ?= $(error "can't upload, REMOTE not set")
 release: REMOTE_DIR ?= $(error "can't upload, REMOTE_DIR not set")

Makefile.INCLUDE

@@ -76,4 +76,5 @@ BUILDFLAGS := -ldflags \
 		-X $(REPO_PATH)/version.GoVersion $(GO_VERSION)"
 CURL := curl
 
-ARCHIVE := prometheus-$(VERSION).$(GOOS)-$(GOARCH).tar.gz
+ARCHIVEDIR := prometheus-$(VERSION).$(GOOS)-$(GOARCH)
+ARCHIVE := $(ARCHIVEDIR).tar.gz