mirror of
ssh://git.janware.com/janware/proj/jw-pkg
synced 2026-04-24 09:13:37 +02:00
make: Replace RPM -> PKG
jw-pkg supports more than RPM-based package managers, but for historic reasons, lots of its Makefile variables still have "RPM" in their names. This is misleading. Replace "RPM" in variable names by the more generic "PKG" where appropriate. Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
ed17aaa6c9
commit
c893584e5e
10 changed files with 118 additions and 122 deletions
|
|
@ -61,7 +61,7 @@ ifneq ($(SUBDIRS_TO_ITERATE),)
|
|||
endif
|
||||
|
||||
include $(JWBDIR)/make/dirs.mk
|
||||
include $(JWBDIR)/make/rpmdist.mk
|
||||
include $(JWBDIR)/make/pkg-dist.mk
|
||||
include $(JWBDIR)/make/rules.mk
|
||||
include $(JWBDIR)/make/doc-rules.mk
|
||||
include $(JWBDIR)/make/list-files.mk
|
||||
|
|
@ -140,7 +140,7 @@ git-init: git-init.done $(GIT_DESCR)
|
|||
|
||||
git-init-from-cvs: git-init
|
||||
$(LIST_VCS_FILES) -f | xargs git add
|
||||
git commit -m "First commit of $(RPM_VERSION)"
|
||||
git commit -m "First commit of $(PKG_VERSION)"
|
||||
|
||||
git-config:
|
||||
git config --global user.name || git config --global user.name "$(FULL_NAME)"
|
||||
|
|
@ -171,7 +171,7 @@ projects-%:
|
|||
$(PYTHON) $(JWB_SCRIPT_DIR)/jw-pkg.py projects build $* $(PROJECT)
|
||||
|
||||
install-deps-devel:
|
||||
sudo zypper in $(shell echo $(RPM_REQUIRES_DEVEL) | sed "s/ *= */-/g; s/ [^ ]\+-__NEXT_VERSION__//")
|
||||
sudo zypper in $(shell echo $(PKG_REQUIRES_DEVEL) | sed "s/ *= */-/g; s/ [^ ]\+-__NEXT_VERSION__//")
|
||||
|
||||
streamline:
|
||||
$(STREAMLINE_PROJECT)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue