From a605b9ffd3c2e7d227e35b911761f720bf07b7e6 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Sun, 2 Apr 2006 00:09:43 +0000
Subject: [PATCH] Fix some includes to point into X11/fonts/ properly.

---
 ChangeLog                   | 6 ++++++
 Xprint/ps/PsFTFonts.c       | 4 ++--
 Xprint/ps/psout_ft.c        | 4 ++--
 Xprint/ps/psout_ftpstype1.c | 4 ++--
 Xprint/ps/psout_ftpstype3.c | 4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74a460e7f..366b309fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,12 @@
 	Disable Xprint freetype support momentarily.  Needs ttf2pt1.c, which
 	exists in the monolith but has an advertising clause in the license.
 
+	* Xprint/ps/PsFTFonts.c:
+	* Xprint/ps/psout_ft.c:
+	* Xprint/ps/psout_ftpstype1.c:
+	* Xprint/ps/psout_ftpstype3.c:
+	Fix some includes to point into X11/fonts/ properly.
+
 2006-04-01  Eric Anholt  <anholt@FreeBSD.org>
 
 	* exa/exa_accel.c: (exaCopyWindow):
diff --git a/Xprint/ps/PsFTFonts.c b/Xprint/ps/PsFTFonts.c
index c992987d4..8857ae43e 100644
--- a/Xprint/ps/PsFTFonts.c
+++ b/Xprint/ps/PsFTFonts.c
@@ -42,9 +42,9 @@ THE SOFTWARE.
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
-#include "ft.h"
+#include <X11/fonts/ft.h>
 #define NOT_IN_FTFUNCS
-#include "ftfuncs.h"
+#include <X11/fonts/ftfuncs.h>
 
 char *
 PsGetFTFontFileName(FontPtr pFont)
diff --git a/Xprint/ps/psout_ft.c b/Xprint/ps/psout_ft.c
index 34cb6a54d..b10d9e592 100644
--- a/Xprint/ps/psout_ft.c
+++ b/Xprint/ps/psout_ft.c
@@ -41,9 +41,9 @@ THE SOFTWARE.
 #include <X11/fonts/fntfilst.h>
 #include <X11/fonts/fontutil.h>
 #include <X11/fonts/fontenc.h>
-#include "ft.h"
+#include <X11/fonts/ft.h>
 #define NOT_IN_FTFUNCS
-#include "ftfuncs.h"
+#include <X11/fonts/ftfuncs.h>
 #include "servermd.h" /* needed for endian test (IMAGE_BYTE_ORDER) */
 
 #define USE_FT_PS_NAMES 1
diff --git a/Xprint/ps/psout_ftpstype1.c b/Xprint/ps/psout_ftpstype1.c
index 19e1bde18..2d40c186a 100644
--- a/Xprint/ps/psout_ftpstype1.c
+++ b/Xprint/ps/psout_ftpstype1.c
@@ -44,9 +44,9 @@ THE SOFTWARE.
 #include <X11/fonts/fntfilst.h>
 #include <X11/fonts/fontutil.h>
 #include <X11/fonts/fontenc.h>
-#include "ft.h"
+#include <X11/fonts/ft.h>
 #define NOT_IN_FTFUNCS
-#include "ftfuncs.h"
+#include <X11/fonts/ftfuncs.h>
 
 int do_debug_ft2pt1             = FALSE;
 int do_enable_ft2pt1_optimizer  = FALSE;
diff --git a/Xprint/ps/psout_ftpstype3.c b/Xprint/ps/psout_ftpstype3.c
index fab8b5cb0..733b5386b 100644
--- a/Xprint/ps/psout_ftpstype3.c
+++ b/Xprint/ps/psout_ftpstype3.c
@@ -61,9 +61,9 @@ THE SOFTWARE.
 #include <X11/fonts/fntfilst.h>
 #include <X11/fonts/fontutil.h>
 #include <X11/fonts/fontenc.h>
-#include "ft.h"
+#include <X11/fonts/ft.h>
 #define NOT_IN_FTFUNCS
-#include "ftfuncs.h"
+#include <X11/fonts/ftfuncs.h>
 
 struct ft2info
 {