34 lines
1006 B
Diff
34 lines
1006 B
Diff
|
From 60ab75597d2735e8f7bf91e4423feab87568d1e7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Suchanek <msuchanek@suse.de>
|
||
|
|
Date: Sun, 18 Jul 2021 22:05:01 +0200
|
||
|
|
Subject: [PATCH] Makefile: Default LIBSUBDIR to lib64 on 64bit architectures.
|
||
|
|
|
||
|
|
commit a82a66e ("Extend build and add install rules to Makefile") adds
|
||
|
|
special handling for LIBSUBDIR on x86_64. Expand this to all
|
||
|
|
architectures with 64 in name which suggests a 32bit variant exists, and
|
||
|
|
s390x which is 64bit extension of s390.
|
||
|
|
|
||
|
|
Fixes: #337
|
||
|
|
Fixes: a82a66e ("Extend build and add install rules to Makefile")
|
||
|
|
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
|
||
|
|
---
|
||
|
|
src/Makefile | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/Makefile b/src/Makefile
|
||
|
|
index 8161fec..8bf1d8a 100644
|
||
|
|
--- a/src/Makefile
|
||
|
|
+++ b/src/Makefile
|
||
|
|
@@ -60,7 +60,7 @@ INSTALL = install
|
||
|
|
|
||
|
|
DESTDIR ?=
|
||
|
|
|
||
|
|
-ifeq ($(shell uname -m),x86_64)
|
||
|
|
+ifeq ($(filter-out %64 %64be %64eb %64le %64el s390x, $(shell uname -m)),)
|
||
|
|
LIBSUBDIR := lib64
|
||
|
|
else
|
||
|
|
LIBSUBDIR := lib
|
||
|
|
--
|
||
|
|
2.32.0
|
||
|
|
|