srcdist.mk: Make wd-upload work with upload-defs.mk

wd-upload doesn\'t work at all, because it clashed with rpmdist.mk defining
stuff used by the upload-*.mk files. The RPM-side of things is left untested.

Signed-off-by: Jan Lindemann <jan@janware.com>

make/rpmdist.mk

@@ -1,5 +1,12 @@
 RPM_PROJECT              ?= $(FLAVOUR_PREFIX)$(PROJECT)
 
+ifeq ($(filter pkg-%,$(MAKECMDGOALS)),)
+  # also to be used from proj.mk, typically
+  BUILD_PROJECT_PACKAGE   = false
+endif
+
+RPM_VERSION              ?= $(DIST_VERSION)
+
 ifneq ($(BUILD_PROJECT_PACKAGE),false)
 UPLOAD_SH                 = $(MOD_SCRIPT_DIR)/upload.sh
 LOCAL_MKSPEC_SH          ?= $(TOPDIR)/make/mkspec.sh
@@ -14,7 +21,6 @@ FTP_HOST                 ?= pkg.janware.com
 FTP_FILE_MODE            ?= 644
 FTP_DIR_MODE             ?= 755
 FTP_HOST_LOGIN           ?= root
-RPM_VERSION              ?= $(DIST_VERSION)
 RELEASES_FILE     = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
 RELEASES         ?= $(shell $(PKG_SH_EXE) version \
 	-p $(OS)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
@@ -32,6 +38,7 @@ DIST_SRC_DIR              = $(DIST_DIR)/src/$(RPM_PROJECT)-$(RPM_VERSION)
 DIST_PCKG_DIR             = $(DIST_DIR)/pckg
 #DIST_FILE                 = $(DIST_PCKG_DIR)/$(PROJECT)-$(DIST_VERSION).tar.gz
 
+UPLOAD_SRC_DIR            = $(DIST_PCKG_DIR)
 PCKG_TAR                 ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
 
 ifeq ($(PKG_FORMAT),debian)
@@ -369,4 +376,3 @@ pkg-upload-stable:
 	@echo "This project doesn't support building packages, ignoring request to $(patsubst pkg-%,%,$@)."
 
 endif # ifneq ($(BUILD_PROJECT_PACKAGE),false)
-