From 21dd07a4ab25709b77dc04b1e5563f7a2fa52869 Mon Sep 17 00:00:00 2001
From: yuzu-eva <stevenhu@web.de>
Date: Fri, 25 Nov 2022 14:31:33 +0100
Subject: changed libXft library

---
 config.mk | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'config.mk')

diff --git a/config.mk b/config.mk
index 480a98e..8bb98e0 100644
--- a/config.mk
+++ b/config.mk
@@ -7,8 +7,10 @@ VERSION = 0.9
 PREFIX = /usr/local
 MANPREFIX = $(PREFIX)/share/man
 
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
+# X11INC = /usr/X11R6/include
+# X11LIB = /usr/X11R6/lib
+X11INC = /home/cafebabe/.local/src/libxft/include
+X11LIB = /home/cafebabe/.local/src/libxft/src/.libs
 
 PKG_CONFIG = pkg-config
 
@@ -16,19 +18,16 @@ PKG_CONFIG = pkg-config
 INCS = -I$(X11INC) \
        `$(PKG_CONFIG) --cflags fontconfig` \
        `$(PKG_CONFIG) --cflags freetype2`
-# LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
-#        `$(PKG_CONFIG) --libs fontconfig` \
-#        `$(PKG_CONFIG) --libs freetype2`
-#
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender \
-	   -Wl,-rpath=/usr/local/lib \
-       `$(PKG_CONFIG) --libs fontconfig` \
-       `$(PKG_CONFIG) --libs freetype2` \
+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
+        `$(PKG_CONFIG) --libs fontconfig` \
+        `$(PKG_CONFIG) --libs freetype2`
+
 
 # flags
 STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
 STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
-STLDFLAGS = $(LIBS) $(LDFLAGS)
+# STLDFLAGS = $(LIBS) $(LDFLAGS)
+STLDFLAGS = -Xlinker -rpath=$(X11LIB) $(LIBS) $(LDFLAGS)
 
 # OpenBSD:
 #CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
-- 
cgit v1.2.3