Index: GetPid.c
===================================================================
RCS file: /home/kde/kdebase/kcontrol/kfontinst/lib/GetPid.c,v
retrieving revision 1.4
diff -u -r1.4 GetPid.c
--- GetPid.c	1 Oct 2003 20:48:42 -0000	1.4
+++ GetPid.c	30 Oct 2003 21:59:39 -0000
@@ -152,7 +152,7 @@
     return error ? 0 : pid;
 }
 
-#elif defined OS_FreeBSD || defined OS_NetBSD || defined __FreeBSD__ || defined __NetBSD__
+#elif defined OS_FreeBSD || defined OS_NetBSD || defined __FreeBSD__ || defined __NetBSD__ || defined __APPLE__
 
 #include <ctype.h>
 #include <dirent.h>
Index: Makefile.am
===================================================================
RCS file: /home/kde/kdebase/kcontrol/kfontinst/lib/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- Makefile.am	22 Aug 2003 13:52:43 -0000	1.3
+++ Makefile.am	30 Oct 2003 21:59:39 -0000
@@ -8,7 +8,8 @@
 Fontmap.cpp \
 Global.cpp \
 Misc.cpp \
-XConfig.cpp
+XConfig.cpp \
+kxftconfig.cpp
 
 noinst_HEADERS = \
 CompressedFile.h \
@@ -19,8 +20,17 @@
 Global.h \
 Misc.h \
 XConfig.h \
-GetPid.c
+GetPid.c \
+kxftconfig.h
 
 libkfontinst_la_LIBADD = $(LIB_FONT_ENC) $(LIB_KIO) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS)
 libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
 INCLUDES= $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -DOS_$(UNAME) -I$(srcdir)/../../fonts $(all_includes)
+
+kxftconfig.lo: kxftconfig.cpp kxftconfig.h
+
+kxftconfig.cpp: kxftconfig.h
+	cp $(srcdir)/../../fonts/kxftconfig.cpp .
+
+kxftconfig.h:
+	cp $(srcdir)/../../fonts/kxftconfig.h .
Index: XConfig.cpp
===================================================================
RCS file: /home/kde/kdebase/kcontrol/kfontinst/lib/XConfig.cpp,v
retrieving revision 1.4
diff -u -r1.4 XConfig.cpp
--- XConfig.cpp	1 Oct 2003 22:26:54 -0000	1.4
+++ XConfig.cpp	30 Oct 2003 21:59:39 -0000
@@ -33,11 +33,16 @@
 #include <string.h>
 #include <qdir.h>
 #include <klocale.h>
+#include "kxftconfig.h"
 
-#include "kxftconfig.cpp" // CPD: HACK!!! How to sym-link in CVS???
+extern "C" {
 #include "GetPid.c"  // #included as want function to be static...
+}
 
 static const QCString constFontpaths ("# KFontinst fontpaths file -- DO NOT EDIT");
+static QString expandHome(QString path);
+static QString contractHome(QString path);
+
 #define UNSCALED ":unscaled"
 
 using namespace std;
