From a029688d8e3103ceed7ea27b2f8c0dab44f67320 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sat, 16 Jun 2007 17:53:44 +0000
Subject: [PATCH] upload-defs.mk: Add default variables for upload

---
 make/upload-defs.mk | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/make/upload-defs.mk b/make/upload-defs.mk
index e2405ebb..b5d5913a 100644
--- a/make/upload-defs.mk
+++ b/make/upload-defs.mk
@@ -5,19 +5,16 @@
 
 UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
 
-ifeq ($(RPM_PROJECT),)
-RPM_PROJECT = $(PROJECT)
-endif
-
-ifndef FTP_FILE_MODE
-FTP_FILE_MODE = 640
-endif
-
-ifndef FTP_DIR_MODE
-FTP_DIR_MODE = 750
-endif
-
-RPM_VERSION = $(VERSION)
+FTP_FILE_MODE    ?= 640
+FTP_DIR_MODE     ?= 750
+FTP_SRC_GROUP    ?= spidsrc
+FTP_SRC_USER     ?= $(shell whoami)
+FTP_RUN_GROUP    ?= spidrun
+FTP_RUN_USER     ?= $(shell whoami)
+FTP_DEV_GROUP    ?= spiddev
+FTP_DEV_USER     ?= $(shell whoami)
+FTP_HOST         ?= ftp.jannet.de
+FTP_HOST_LOGIN   ?= root
 
 PCKG_ROOT                 = $(FTP_PCKG_DIR)/$(RPM_PROJECT)
 CURRENT_SRC               = $(PCKG_ROOT)/src/$(PCKG_TAR)