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: Support FLAVOUR_PATH_PREFIX

Browse source 
- Beautification of the copy process
  - Honour FLAVOUR_PREFIX to RPM_PROJECT
This commit is contained in:
Jan Lindemann 2007-08-28 23:55:34 +00:00 • committed by Jan Lindemann
commit 147587dce8
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
make/rpmdist.mk
View file

@ -1,9 +1,6 @@
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
ifeq ($(RPM_PROJECT),) RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT)
RPM_PROJECT ?= $(PROJECT)
endif
MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
FTP_SRC_GROUP ?= $(shell id -g) FTP_SRC_GROUP ?= $(shell id -g)
FTP_SRC_USER ?= $(shell whoami) FTP_SRC_USER ?= $(shell whoami)
@ -74,21 +71,16 @@ rpm-reinstall: rpm-uninstall rpm-clean rpm-install
clean.rpm: clean.rpm:
rm -rf $(DIST_DIR) *.dist 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: cpfiles.dist:
mkdir -p $(DIST_SRC_DIR) 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) \ sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) \
-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -P $(PROJECT) \ -R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" -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 $@
%.tar.gz: cpfiles.dist cpmod.dist %.tar.gz: cpfiles.dist
mkdir -p $(DIST_PCKG_DIR) mkdir -p $(DIST_PCKG_DIR)
tar --anchored $(addprefix --exclude=,$(GENERATED)) \ tar --anchored $(addprefix --exclude=,$(GENERATED)) \
-czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR)) -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))