From cf17f9737cb1735a9f120f61f360d1efbc31e39b Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 22 Aug 2007 17:02:54 +0000 Subject: [PATCH] rpmdist.mk: Support DIST_DIR - Add variable $(DIST_DIR) - Remove $(DIST_DIR) on clean --- make/rpmdist.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 897fca3a..1e0b2374 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -23,9 +23,9 @@ RPMBUILD ?= rpmbuild include $(MODDIR)/make/tag-defs.mk -CLEAN += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp) -DIST_SRC_DIR = dist/src/$(RPM_PROJECT)-$(RPM_VERSION) -DIST_PCKG_DIR = dist/pckg +DIST_DIR = dist +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 PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz @@ -64,7 +64,7 @@ rpm-install: config rpminstall.dist rpm-reinstall: rpm-uninstall rpm-clean rpm-install clean.rpm: - rm -rf $(DIST_SRC_DIR) $(PCKG_TAR) *.dist + rm -rf $(DIST_DIR) *.dist cpmod.dist: for mod in $(SUBDIRS); do \