From e2861fe97c44d89816ec7fe7018ab0469827a514 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sat, 16 Jun 2007 17:55:39 +0000
Subject: [PATCH] rpmdist.mk: Allow predefining some variables

- Add MKSPEC_SH definition
- Replace = by ?= here and there
---
 make/rpmdist.mk | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index b05de9cc..2678ce98 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -1,29 +1,19 @@
-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)
+MKSPEC_SH                ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
+RPM_PROJECT              ?= $(PROJECT)
+RPM_VERSION              ?= $(VERSION)
 
 include $(MODDIR)/make/tag-defs.mk
 
-CLEAN                     += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp)
+CLEAN                    += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp)
 DIST_SRC_DIR              = dist/src/$(RPM_PROJECT)-$(RPM_VERSION)
 DIST_PCKG_DIR             = dist/pckg
 
-PCKG_TAR                  = $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
-PCKG_RPM_RUN_I386         = $(RPM_PROJECT)-run-$(RPM_VERSION).i386.rpm
-PCKG_RPM_DEVEL_I386       = $(RPM_PROJECT)-devel-$(RPM_VERSION).i386.rpm
-PCKG_RPM_SRC              = $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
+PCKG_TAR                 ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
+PCKG_RPM_RUN_I386        ?= $(RPM_PROJECT)-run-$(RPM_VERSION).i386.rpm
+PCKG_RPM_DEVEL_I386      ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).i386.rpm
+PCKG_RPM_SRC             ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
+RPM_VERSION              ?= $(VERSION)
+
 
 include $(MODDIR)/make/upload-defs.mk