From d655d5cfd02f9c5b8595fc4cdc59e64c4da695db Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 30 Aug 2007 10:18:49 +0000 Subject: [PATCH] rpmdist.mk: Add RPM_EXTRA_FILES (untested) --- make/rpmdist.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index f87a4315..26911210 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -69,8 +69,11 @@ rpm-reinstall: rpm-uninstall rpm-clean rpm-install clean.rpm: rm -rf $(DIST_DIR) *.dist -cpfiles.dist: +src-dir.dist: mkdir -p $(DIST_SRC_DIR) + touch $@ + +cpfiles.dist: src-dir.dist $(cvs_files) | grep -v VERSION | cpio -o -H newc | ( cd $(DIST_SRC_DIR); cpio --make-directories -i) sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) \ -R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \ @@ -78,7 +81,7 @@ cpfiles.dist: echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION touch $@ -%.tar.gz: cpfiles.dist +%.tar.gz: $(RPM_EXTRA_FILES) cpfiles.dist mkdir -p $(DIST_PCKG_DIR) tar --anchored $(addprefix --exclude=,$(GENERATED)) \ -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))