From 84da6102dc2cc2fa55ad9786ad2465a20063b62a Mon Sep 17 00:00:00 2001
From: Kris Maglione <kris@vimperator.org>
Date: Sun, 1 Nov 2009 19:23:25 -0500
Subject: [PATCH] Fix 'make dist'

---
 common/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/Makefile b/common/Makefile
index bd8deac6..022c002d 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -36,7 +36,8 @@ RDF_IN        = $(RDF).in
 
 BUILD_DIR     = build.$(VERSION).$(OS)
 
-AWK = awk
+AWK  = awk
+CURL = curl
 
 .SILENT:
 
@@ -84,12 +85,12 @@ dist: $(XPI)
 	labels="Project-$$proj,$(labels)";					\
 	[ -n "$(featured)" ] && labels="$$labels,Featured";             	\
 								        	\
-	IFS=,; for l in $$(echo $$labels); do					\
+	IFS=,; for l in $$labels; do						\
 		set -- "$$@" --form-string "label=$$l";				\
 	done;									\
-	curl "$@" --form-string "summary=$$summary" 				\
-		-F "filename=<$(XPI)"						\
-		-H "Authorization: $$(echo "$(GOOGLE_USER):$(GOOGLE_PASS)" | base64)" \
+	$(CURL) "$$@" --form-string "summary=$$summary" 			\
+		-F "filename=@$(XPI)"						\
+		-H "Authorization: Basic $$(echo -n "$(GOOGLE_USER):$(GOOGLE_PASS)" | base64)" \
 		-i "$(GOOGLE)" | sed -n '/^Location/{p;q}'
 
 $(RDF): $(RDF_IN) Makefile