trevorb/common
1
0
Fork 0
Code Pull Requests Activity

Take out archivefile as target

Browse Source
This commit is contained in:
Brian Read 2023-03-21 16:01:52 +00:00
parent 1506c62bf8
commit ff57170d3f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.common
View File

@ -89,8 +89,8 @@ RPM_BUILD_DIR ?= $(BUILDDIR)/$(NAME)-$(VERSION)
#needed for archivefile rule #needed for archivefile rule
TREEPATH := $(NAME)-$(VERSION) TREEPATH := $(NAME)-$(VERSION)
TREEPATH := $(NAME)-$(VERSION) TREEPATH := $(NAME)-$(VERSION)
EXT := $(shell cat $(NAME).spec | grep Source | sed 's/Source: //' | sed -E 's/^([^.]*\.)(.*)$/\2//') EXT := $(shell cat $(NAME).spec | grep Source | head -n 1 | sed 's/Source: //' | sed -E 's/^([^.]*\.)(.*)$/\2//')
ARCHIVEFILE := $(shell cat $(NAME).spec | grep Source | sed -r 's/^Source[0..9]*:\s*//' | xargs basename) ARCHIVEFILE := $(shell cat $(NAME).spec | grep Source | head -n 1 | sed -r 's/^Source[0..9]*:\s*//' | xargs basename)
ARCHIVEFILE := $(shell rpm --queryformat '$(ARCHIVEFILE)\n' --specfile $(NAME).spec | head -n 1) ARCHIVEFILE := $(shell rpm --queryformat '$(ARCHIVEFILE)\n' --specfile $(NAME).spec | head -n 1)
TEMPDIR := $(shell mktemp -d) TEMPDIR := $(shell mktemp -d)
@ -160,7 +160,8 @@ PREP_ARCHES = $(addprefix prep-,$(ARCHES))
# The TARGETS define is meant for local module targets that should be # The TARGETS define is meant for local module targets that should be
# made in addition to the SOURCEFILES whenever needed # made in addition to the SOURCEFILES whenever needed
TARGETS ?= archivefile # TARGETS ?= archivefile
TARGETS ?=
# default target - retrieve the sources and make the module specific targets # default target - retrieve the sources and make the module specific targets
sources: $(SOURCEFILES) $(TARGETS) sources: $(SOURCEFILES) $(TARGETS)