mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
rpmdist.mk: Support FLAVOUR_PATH_PREFIX
- Beautification of the copy process - Honour FLAVOUR_PREFIX to RPM_PROJECT
This commit is contained in:
parent
946aaa27fb
commit
147587dce8
1 changed files with 3 additions and 11 deletions
|
|
@ -1,9 +1,6 @@
|
|||
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
|
||||
|
||||
ifeq ($(RPM_PROJECT),)
|
||||
RPM_PROJECT ?= $(PROJECT)
|
||||
endif
|
||||
|
||||
RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT)
|
||||
MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
|
||||
FTP_SRC_GROUP ?= $(shell id -g)
|
||||
FTP_SRC_USER ?= $(shell whoami)
|
||||
|
|
@ -74,21 +71,16 @@ rpm-reinstall: rpm-uninstall rpm-clean rpm-install
|
|||
clean.rpm:
|
||||
rm -rf $(DIST_DIR) *.dist
|
||||
|
||||
cpmod.dist:
|
||||
mkdir -p $(DIST_SRC_DIR)
|
||||
$(cvs_files) | cpio -o -H newc | ( cd $(DIST_SRC_DIR); cpio --make-directories -i)
|
||||
touch $@
|
||||
|
||||
cpfiles.dist:
|
||||
mkdir -p $(DIST_SRC_DIR)
|
||||
cp $(wildcard Makefile configure.ac.tmpl) $(DIST_SRC_DIR)
|
||||
$(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) \
|
||||
> $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec
|
||||
echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION
|
||||
touch $@
|
||||
|
||||
%.tar.gz: cpfiles.dist cpmod.dist
|
||||
%.tar.gz: cpfiles.dist
|
||||
mkdir -p $(DIST_PCKG_DIR)
|
||||
tar --anchored $(addprefix --exclude=,$(GENERATED)) \
|
||||
-czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue