Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use correct libdir for multiarch Debian #651

Merged
merged 2 commits into from
Jun 4, 2020
Merged

Use correct libdir for multiarch Debian #651

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01b4e68
Use correct libdir for multiarch Debian
ilammy Jun 4, 2020
21ebf9a
Avoid Debian/Ubuntu duplication
ilammy Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,17 +623,13 @@ RPM_DEPENDENCIES_THEMISPP = --depends "$(RPM_DEV_PACKAGE_NAME) = $(RPM_VERSION)-
RPM_DEPENDENCIES_JNI += --depends "$(PACKAGE_NAME) >= $(RPM_VERSION)-$(RPM_RELEASE_NUM)"
RPM_RELEASE_NUM = 1

ifeq ($(shell lsb_release -is 2> /dev/null),Debian)
OS_NAME := $(shell lsb_release -is 2>/dev/null || printf 'unknown')
ifeq ($(OS_NAME),$(filter $(OS_NAME),Debian Ubuntu))
#0.9.4-153-g9915004+jessie_amd64.deb.
NAME_SUFFIX = $(VERSION)+$(DEB_CODENAME)_$(DEB_ARCHITECTURE).deb
OS_CODENAME = $(shell lsb_release -cs)
DEB_LIBDIR := /lib/$(shell $(CC) -dumpmachine)
else ifeq ($(shell lsb_release -is 2> /dev/null),Ubuntu)
NAME_SUFFIX = $(VERSION)+$(DEB_CODENAME)_$(DEB_ARCHITECTURE).deb
OS_CODENAME = $(shell lsb_release -cs)
DEB_LIBDIR := /lib/$(shell $(CC) -dumpmachine)
else
# centos/rpm
DEB_LIBDIR := /lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
else ifeq ($(OS_NAME),$(filter $(OS_NAME),RedHatEnterpriseServer CentOS))
OS_NAME = $(shell cat /etc/os-release | grep -e "^ID=\".*\"" | cut -d'"' -f2)
OS_VERSION = $(shell cat /etc/os-release | grep -i version_id|cut -d'"' -f2)
ARCHITECTURE = $(shell arch)
Expand Down