ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Variable Capitalization

Browse Source
This commit is contained in:
W. Felix Handte
2020-02-18 13:40:58 -05:00
parent 73737231b9
commit e5ef935cf6
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Makefile
+8 -7
View File
@@ -219,27 +219,28 @@ DESTDIR ?=
prefix ?= /usr/local prefix ?= /usr/local
PREFIX ?= $(prefix) PREFIX ?= $(prefix)
exec_prefix ?= $(PREFIX) exec_prefix ?= $(PREFIX)
libdir ?= $(exec_prefix)/lib EXEC_PREFIX ?= $(exec_prefix)
libdir ?= $(EXEC_PREFIX)/lib
LIBDIR ?= $(libdir) LIBDIR ?= $(libdir)
includedir ?= $(PREFIX)/include includedir ?= $(PREFIX)/include
INCLUDEDIR ?= $(includedir) INCLUDEDIR ?= $(includedir)
PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(exec_prefix)\\(/\\|$$\\)@@p") PCLIBDIR ?= $(shell echo "$(LIBDIR)" | sed -n -e "s@^$(EXEC_PREFIX)\\(/\\|$$\\)@@p")
PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(prefix)\\(/\\|$$\\)@@p") PCINCDIR ?= $(shell echo "$(INCLUDEDIR)" | sed -n -e "s@^$(PREFIX)\\(/\\|$$\\)@@p")
ifeq (,$(PCLIBDIR)) ifeq (,$(PCLIBDIR))
# Additional prefix check is required, since the empty string is technically a # Additional prefix check is required, since the empty string is technically a
# valid PCLIBDIR # valid PCLIBDIR
ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(exec_prefix)\\(/\\|$$\\)@ p")) ifeq (,$(shell echo "$(LIBDIR)" | sed -n -e "\\@^$(EXEC_PREFIX)\\(/\\|$$\\)@ p"))
$(error configured libdir ($(LIBDIR)) is outside of prefix ($(prefix)), can't generate pkg-config file) $(error configured libdir ($(LIBDIR)) is outside of prefix ($(PREFIX)), can't generate pkg-config file)
endif endif
endif endif
ifeq (,$(PCINCDIR)) ifeq (,$(PCINCDIR))
# Additional prefix check is required, since the empty string is technically a # Additional prefix check is required, since the empty string is technically a
# valid PCINCDIR # valid PCINCDIR
ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(prefix)\\(/\\|$$\\)@ p")) ifeq (,$(shell echo "$(INCLUDEDIR)" | sed -n -e "\\@^$(PREFIX)\\(/\\|$$\\)@ p"))
$(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(exec_prefix)), can't generate pkg-config file) $(error configured includedir ($(INCLUDEDIR)) is outside of exec_prefix ($(EXEC_PREFIX)), can't generate pkg-config file)
endif endif
endif endif