janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 21:27:39 +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

8
make/qt-defs.mk
View file

@ -11,11 +11,11 @@ CPPFLAGS += -DQT_THREAD_SUPPORT
#QT_MAJOR_VERSION ?= $(shell echo $(QT_VERSION) | cut -d\. -f1)
#
#ifeq ($(QT_MAJOR_VERSION),2)
# QT_PREFIX ?= /usr/lib/qt2
# QT_PREFIX ?= $(SYSTEM_LIBDIR)/qt2
# INCLUDE += -I$(QT_PREFIX)/include
#else
# ifeq ($(QT_MAJOR_VERSION),3)
# QT_PREFIX ?= /usr/lib/qt3
# QT_PREFIX ?= $(SYSTEM_LIBDIR)/qt3
# INCLUDE += -I$(QT_PREFIX)/include
# else
# ifeq ($(QT_MAJOR_VERSION),4)
@ -37,8 +37,8 @@ CPPFLAGS += -DQT_THREAD_SUPPORT
# LD_LIB_PATH += $(QT_PREFIX)/lib
# QT_LDFLAGS += -L$(QT_PREFIX)/lib
# else
# LD_LIB_PATH += $(QT_PREFIX)/lib64
# QT_LDFLAGS += -L$(QT_PREFIX)/lib64
# LD_LIB_PATH += $(QT_PREFIX)/$(SYSTEM_LIBDIR_NAME)
# QT_LDFLAGS += -L$(QT_PREFIX)/$(SYSTEM_LIBDIR_NAME)
# endif
#endif
#