janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

make, scripts: Project description default location is now $(TOPDIR)/make

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-01-29 14:03:03 +00:00
commit c7400a0bd8
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/defs.mk
View file

@ -73,7 +73,7 @@ endif
CVS_PROJ_DIR ?= $(TOPDIR)/..
CVSTOPDIR ?= $(CVS_PROJ_DIR)/..
PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/doc/share/project.txt)
PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/make/project.conf)
PROJECT_SHORT_NAME ?= $(PROJECT)
PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/_/g')
PROJECT_DESCR ?= No description

2
make/rpmdist.mk
View file

@ -74,6 +74,8 @@ BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
endif
DIST_PCKG_SRPM = $(BINARY_RPM) $(DIST_PCKG_DIR)/$(PCKG_RPM_SRC)
# to be replaced by pkg.sh
RPM_REQUIRES_DEVEL += $(call proj_query, pkg-requires devel $(PROJECT))
RPM_REQUIRES_RUN += $(call proj_query, pkg-requires run $(PROJECT))
RPM_REQUIRES_DEVEL += $(RPM_PROJECT)-run = __NEXT_VERSION__
unexport RPM_VERSION VERSION DIST_SRC_DIR

2
make/topdir.mk
View file

@ -6,7 +6,7 @@ config:
SUBDIRS ?= $(wildcard inst/pre make scripts contrib tools src include lib bin \
util plugins conf config cfg images doc test inst/post)
PROJECT_DESCR = $(TOPDIR)/doc/share/project.txt
PROJECT_DESCR = $(TOPDIR)/make/project.conf
ifneq ($(wildcard $(TOPDIR)/make/defs.mk),)
include $(TOPDIR)/make/defs.mk

2
scripts/pkg.sh
View file

@ -851,7 +851,7 @@ CHECK_CVS_SYNC_BEFORE_RPM_RELEASE=false
#LAST_RPM_VERSION=`read_map $TOPDIR/LAST_RPM_VERSION`
myname=`basename $0`
tmp_mkdef_sh=""
PROJECT_DESCR_FILE=$TOPDIR/doc/share/project.txt
PROJECT_DESCR_FILE=$TOPDIR/make/project.conf
DIST_SRC_DIR=dist/src
DIST_INST_DIR=dist/src
DIST_PCKG_DIR=dist/pckg