mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
rpmdist.mk: Allow predefining some variables
- Add MKSPEC_SH definition - Replace = by ?= here and there
This commit is contained in:
parent
acfaa37045
commit
e2861fe97c
1 changed files with 10 additions and 20 deletions
|
|
@ -1,29 +1,19 @@
|
|||
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
|
||||
|
||||
ifeq ($(RPM_PROJECT),)
|
||||
RPM_PROJECT = $(PROJECT)
|
||||
endif
|
||||
|
||||
ifndef FTP_FILE_MODE
|
||||
FTP_FILE_MODE = 640
|
||||
endif
|
||||
|
||||
ifndef FTP_DIR_MODE
|
||||
FTP_DIR_MODE = 750
|
||||
endif
|
||||
|
||||
RPM_VERSION = $(VERSION)
|
||||
MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
|
||||
RPM_PROJECT ?= $(PROJECT)
|
||||
RPM_VERSION ?= $(VERSION)
|
||||
|
||||
include $(MODDIR)/make/tag-defs.mk
|
||||
|
||||
CLEAN += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp)
|
||||
CLEAN += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp)
|
||||
DIST_SRC_DIR = dist/src/$(RPM_PROJECT)-$(RPM_VERSION)
|
||||
DIST_PCKG_DIR = dist/pckg
|
||||
|
||||
PCKG_TAR = $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
|
||||
PCKG_RPM_RUN_I386 = $(RPM_PROJECT)-run-$(RPM_VERSION).i386.rpm
|
||||
PCKG_RPM_DEVEL_I386 = $(RPM_PROJECT)-devel-$(RPM_VERSION).i386.rpm
|
||||
PCKG_RPM_SRC = $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
|
||||
PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
|
||||
PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run-$(RPM_VERSION).i386.rpm
|
||||
PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).i386.rpm
|
||||
PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
|
||||
RPM_VERSION ?= $(VERSION)
|
||||
|
||||
|
||||
include $(MODDIR)/make/upload-defs.mk
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue