mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-26 23:23:55 +01:00
defs.mk, rpmdist.mk: Remove CURRENT_RPM_SRC on clean
This commit is contained in:
parent
fd158fcb68
commit
1c1f892004
2 changed files with 3 additions and 2 deletions
|
|
@ -25,6 +25,7 @@ FLAVOUR_PATH_SUFFIX ?= /win32
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROJECT ?= $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | sed 's/.*\///; s/-[0-9].*//')))
|
PROJECT ?= $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | sed 's/.*\///; s/-[0-9].*//')))
|
||||||
|
PROJECT_SHORT_NAME ?= $(PROJECT)
|
||||||
PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | sed 's/-/_/g')
|
PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | sed 's/-/_/g')
|
||||||
PROJECT_DESCR ?= No description
|
PROJECT_DESCR ?= No description
|
||||||
CUSTOMER ?= jannet
|
CUSTOMER ?= jannet
|
||||||
|
|
@ -204,7 +205,7 @@ INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(wildcard *.conf))
|
||||||
# -- SYSCFG
|
# -- SYSCFG
|
||||||
SYSCFG_FILES += $(basename $(wildcard *.sysconf))
|
SYSCFG_FILES += $(basename $(wildcard *.sysconf))
|
||||||
BUILD_SYSCFG = $(TOPDIR)/conf
|
BUILD_SYSCFG = $(TOPDIR)/conf
|
||||||
INSTALL_SYSCFGDIR = $(SYSCFG_DIR)
|
INSTALL_SYSCFGDIR ?= $(SYSCFG_DIR)
|
||||||
INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES))
|
INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES))
|
||||||
|
|
||||||
# -- HDR
|
# -- HDR
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,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_DIR) *.dist
|
rm -rf $(DIST_DIR) *.dist CURRENT_RPM_SRC
|
||||||
|
|
||||||
src-dir.dist:
|
src-dir.dist:
|
||||||
mkdir -p $(DIST_SRC_DIR)
|
mkdir -p $(DIST_SRC_DIR)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue