summaryrefslogtreecommitdiff
path: root/editors/elvis/patches/patch-ab
blob: 6aeb6a6cc657a53bd54eb6d3324143ebb7880c37 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
$NetBSD: patch-ab,v 1.2 2004/01/21 17:43:55 recht Exp $

--- configure.orig	2003-10-21 04:32:25.000000000 +0200
+++ configure	2004-01-21 18:22:46.000000000 +0100
@@ -905,11 +905,8 @@
 then
 	case "$FEATURE_XFT" in
 	  define)
-		xft="-lXft "
-		if [ -d /usr/include/freetype2 ]
-		then
-			CC="$CC -I/usr/include/freetype2"
-		fi
+		xft="`pkg-config --libs freetype2 xft` "
+		CC="$CC `pkg-config --cflags freetype2 xft`"
 		;;
 	  *)	
 		xft=""
@@ -950,7 +947,7 @@
 
 
 # Generate the "config.h" file
-ELVISPATH=`echo "~/.elvis:/etc/elvis:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
+ELVISPATH=`echo "~/.elvis:@PKG_SYSCONFDIR@:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
 cat >config.h <<eof-config
 /* config.h */