mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-24 14:50:38 +01:00
rpmdist.mk: Support DIST_DIR
- Add variable $(DIST_DIR) - Remove $(DIST_DIR) on clean
This commit is contained in:
parent
8ccb767f33
commit
cf17f9737c
1 changed files with 4 additions and 4 deletions
|
|
@ -23,9 +23,9 @@ RPMBUILD ?= rpmbuild
|
||||||
|
|
||||||
include $(MODDIR)/make/tag-defs.mk
|
include $(MODDIR)/make/tag-defs.mk
|
||||||
|
|
||||||
CLEAN += $(wildcard *.spec *.rpm *~ *.rpmrc *.dist .*.swp)
|
DIST_DIR = dist
|
||||||
DIST_SRC_DIR = dist/src/$(RPM_PROJECT)-$(RPM_VERSION)
|
DIST_SRC_DIR = $(DIST_DIR)/src/$(RPM_PROJECT)-$(RPM_VERSION)
|
||||||
DIST_PCKG_DIR = dist/pckg
|
DIST_PCKG_DIR = $(DIST_DIR)/pckg
|
||||||
#DIST_FILE = $(DIST_PCKG_DIR)/$(PROJECT)-$(DIST_VERSION).tar.gz
|
#DIST_FILE = $(DIST_PCKG_DIR)/$(PROJECT)-$(DIST_VERSION).tar.gz
|
||||||
|
|
||||||
PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
|
PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
|
||||||
|
|
@ -64,7 +64,7 @@ rpm-install: config rpminstall.dist
|
||||||
rpm-reinstall: rpm-uninstall rpm-clean rpm-install
|
rpm-reinstall: rpm-uninstall rpm-clean rpm-install
|
||||||
|
|
||||||
clean.rpm:
|
clean.rpm:
|
||||||
rm -rf $(DIST_SRC_DIR) $(PCKG_TAR) *.dist
|
rm -rf $(DIST_DIR) *.dist
|
||||||
|
|
||||||
cpmod.dist:
|
cpmod.dist:
|
||||||
for mod in $(SUBDIRS); do \
|
for mod in $(SUBDIRS); do \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue