janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

rpmdist.mk: Mkspec.sh is passed $(add_flavour_prefix)ified dependencies now

Browse source
This commit is contained in:
Jan Lindemann 2007-08-31 11:12:59 +00:00 • committed by Jan Lindemann
commit 1a38392699
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
make/rpmdist.mk
View file

@ -42,7 +42,7 @@ RPMS_DIR = /usr/src/packages/RPMS/$(RPM_ARCH)
SRPMS_DIR = /usr/src/packages/SRPMS SRPMS_DIR = /usr/src/packages/SRPMS
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR) DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
DIST_PCKG_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386) DIST_PCKG_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
RPM_REQUIRES_DEVEL += $(RPM_PROJECT)-run = $(RPM_VERSION) RPM_REQUIRES_DEVEL += $(patsubst $(FLAVOUR_PREFIX)%,%,$(RPM_PROJECT)-run = $(RPM_VERSION))
unexport RPM_VERSION VERSION DIST_SRC_DIR unexport RPM_VERSION VERSION DIST_SRC_DIR
@ -76,7 +76,8 @@ src-dir.dist:
cpfiles.dist: src-dir.dist cpfiles.dist: src-dir.dist
$(cvs_files) | grep -v VERSION | cpio -o -H newc | ( cd $(DIST_SRC_DIR); cpio --make-directories -i) $(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) \ sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) \
-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \ -R "$(shell echo '$(RPM_REQUIRES_RUN)' | $(add_flavour_prefix))" \
-D "$(shell echo '$(RPM_REQUIRES_DEVEL)' | $(add_flavour_prefix))" -P $(PROJECT) \
> $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec > $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec
echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION
touch $@ touch $@