From 1c1f892004dd2b196fc803539ca0cf7a7ce44109 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Thu, 22 May 2008 19:42:35 +0000
Subject: [PATCH] defs.mk, rpmdist.mk: Remove CURRENT_RPM_SRC on clean

---
 make/defs.mk    | 3 ++-
 make/rpmdist.mk | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index 8d08d3fc..1930a5bb 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -25,6 +25,7 @@ FLAVOUR_PATH_SUFFIX   ?= /win32
 endif
 
 PROJECT               ?= $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | sed 's/.*\///; s/-[0-9].*//')))
+PROJECT_SHORT_NAME    ?= $(PROJECT)
 PROJECT_CAPNAME        = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | sed 's/-/_/g')
 PROJECT_DESCR         ?= No description
 CUSTOMER              ?= jannet
@@ -204,7 +205,7 @@ INSTALLED_CFG         ?= $(addprefix $(INSTALL_CFGDIR)/,$(wildcard *.conf))
 # -- SYSCFG
 SYSCFG_FILES          += $(basename $(wildcard *.sysconf))
 BUILD_SYSCFG           = $(TOPDIR)/conf
-INSTALL_SYSCFGDIR      = $(SYSCFG_DIR)
+INSTALL_SYSCFGDIR     ?= $(SYSCFG_DIR)
 INSTALLED_SYSCFG      ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES))
 
 # -- HDR
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index d5e2010d..6633c579 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -69,7 +69,7 @@ rpm-install: config rpminstall.dist
 rpm-reinstall: rpm-uninstall rpm-clean rpm-install
 
 clean.rpm:
-	rm -rf $(DIST_DIR) *.dist
+	rm -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC
 
 src-dir.dist:
 	mkdir -p $(DIST_SRC_DIR)