defs.mk, proj.mk, upload-defs-rpm.mk: Simplified upload variable definitions

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-13 13:38:14 +00:00
commit 6f037b9382
3 changed files with 4 additions and 17 deletions

View file

@ -3,7 +3,8 @@
# VERSION
# MOD_SCRIPT_DIR
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
FTP_FILE_MODE ?= 640
FTP_DIR_MODE ?= 750
@ -16,6 +17,7 @@ FTP_DEV_USER ?= $(shell whoami)
FTP_HOST ?= ftp.jannet.de
FTP_HOST_LOGIN ?= root
FTP_PCKG_DIR = /pub/packages
PCKG_ROOT = $(FTP_PCKG_DIR)/$(RPM_PROJECT)
CURRENT_SRC = $(PCKG_ROOT)/src/$(PCKG_TAR)
CURRENT_RPM_RUN_I386 = $(PCKG_ROOT)/rpm/run/$(PCKG_RPM_RUN_I386)