Merge pull request #478 from heirecka/allow-selecting-pkgconfig
Allow selecting a different pkg-config executable
This commit is contained in:
commit
344028dcb4
1 changed files with 3 additions and 2 deletions
5
Makefile
5
Makefile
|
|
@ -23,11 +23,12 @@ else
|
|||
GIT_PSUFFIX = .$(GIT_SUFFIX)
|
||||
RPM_VERSION = $(NAME)-$(VERSION)-1$(GIT_PSUFFIX)
|
||||
endif
|
||||
PKG_CONFIG = pkg-config
|
||||
UNITDIR_FALLBACK = /usr/lib/systemd/system
|
||||
UNITDIR_DETECT = $(shell pkg-config systemd --variable systemdsystemunitdir || rpm --eval '%{_unitdir}' 2>/dev/null || echo $(UNITDIR_FALLBACK))
|
||||
UNITDIR_DETECT = $(shell $(PKG_CONFIG) systemd --variable systemdsystemunitdir || rpm --eval '%{_unitdir}' 2>/dev/null || echo $(UNITDIR_FALLBACK))
|
||||
UNITDIR = $(UNITDIR_DETECT:%{_unitdir}=$(UNITDIR_FALLBACK))
|
||||
TMPFILESDIR_FALLBACK = /usr/lib/tmpfiles.d
|
||||
TMPFILESDIR_DETECT = $(shell pkg-config systemd --variable tmpfilesdir || rpm --eval '%{_tmpfilesdir}' 2>/dev/null || echo $(TMPFILESDIR_FALLBACK))
|
||||
TMPFILESDIR_DETECT = $(shell $(PKG_CONFIG) systemd --variable tmpfilesdir || rpm --eval '%{_tmpfilesdir}' 2>/dev/null || echo $(TMPFILESDIR_FALLBACK))
|
||||
TMPFILESDIR = $(TMPFILESDIR_DETECT:%{_tmpfilesdir}=$(TMPFILESDIR_FALLBACK))
|
||||
VERSIONED_NAME = $(NAME)-$(VERSION)$(PRERELEASE)$(GIT_PSUFFIX)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue