janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-18 13:03:58 +01:00
Code Activity

make: Make use of $(SYSTEM_LIBDIR) variable more concise

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-09-07 10:13:03 +00:00
commit ccfc979bd0
4 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

27
make/defs.mk
View file

@ -128,22 +128,23 @@ TARGET ?= Linux
ifndef ARCH
ifeq ($(shell uname -m),armv7l)
ARCH = armv7hl
SYSTEM_LIBDIR = /usr/lib
ARCH = armv7hl
SYSTEM_LIBDIR_NAME = lib
else ifeq ($(shell uname -m),armv6l)
ARCH = armv6hl
SYSTEM_LIBDIR = /usr/lib
ARCH = armv6hl
SYSTEM_LIBDIR_NAME = lib
else ifeq ($(shell uname -m),aarch64)
ARCH = aarch64
SYSTEM_LIBDIR = /usr/lib
ARCH = aarch64
SYSTEM_LIBDIR_NAME = lib
else ifeq ($(shell uname -m),x86_64)
ARCH = x86_64
SYSTEM_LIBDIR = /usr/lib64
SYSTEM_LIBDIR_NAME = lib64
else
ARCH_32 = i586
ARCH = $(ARCH_32)
SYSTEM_LIBDIR = /usr/lib
ARCH_32 = i586
ARCH = $(ARCH_32)
SYSTEM_LIBDIR_NAME = lib
endif
SYSTEM_LIBDIR = /usr/$(SYSTEM_LIBDIR_NAME)
endif
ifeq ($(ARCH),$(ARCH_32))
@ -639,11 +640,7 @@ ifeq ($(USE_QT),true)
endif
ifeq ($(USE_X),true)
ifeq ($(ARCH),$(ARCH_32))
BUILD_LDFLAGS += -L/usr/X11/lib -lXext -lX11
else
BUILD_LDFLAGS += -L/usr/X11/lib64 -lXext -lX11
endif
BUILD_LDFLAGS += -L/usr/X11/$(SYSTEM_LIBDIR_NAME) -lXext -lX11
endif
LPPFLAGS += -lstdc++