Call git tools using "git cmd" instead of "git-cmd" syntax

[fontconfig.git] / config / Makedefs.in

diff --git a/config/Makedefs.in b/config/Makedefs.in
index b304379234fadb3aa323dab4ea06e354a815dbf9..e30ada6d74a541df6c80037f5930a5f01eb20021 100644 (file)
--- a/config/Makedefs.in
+++ b/config/Makedefs.in
@@ -1,7 +1,7 @@
 #
-# $XFree86$
+# fontconfig/config/Makedefs.in
 #
-# Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
+# Copyright © 2002 Keith Packard
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
@@ -32,19 +32,12 @@ bindir=@bindir@
 datadir=@datadir@
 includedir=@includedir@
 sysconfdir=@sysconfdir@
-
-CDEBUGFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
-DEFS=@DEFS@
+confdir=@confdir@
 
 DSO_LDOPTS=@DSO_LDOPTS@
 DSO_CFLAGS=@DSO_CFLAGS@
 DSO_PIC_CFLAGS=@DSO_PIC_CFLAGS@
 
-INCLUDES=-I$(TOPDIR) -I$(srcdir)
-
-CFLAGS=$(CDEBUGFLAGS) $(INCLUDES) $(DEFS) $(CPPFLAGS)
-
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
 INSTALL_SCRIPT=@INSTALL_SCRIPT@
@@ -57,7 +50,19 @@ LIBDIR=$(libdir)
 # programs
 BINDIR=$(bindir)
 # font configuration files
-CONFDIR=$(sysconfdir)/fonts
+CONFDIR=@CONFDIR@
+# include files
+INCLUDEDIR=$(includedir)/fontconfig
+
+X_FONT_DIR=@X_FONT_DIR@
+FC_DEFAULT_FONTS=@FC_DEFAULT_FONTS@
+FCPATH_DEF=-DFONTCONFIG_PATH=\"$(CONFDIR)\"
+
+CDEBUGFLAGS=@CFLAGS@
+
+INCLUDES=-I$(TOPDIR) -I$(srcdir) @CPPFLAGS@
+
+CFLAGS=$(CDEBUGFLAGS) @DEFS@ $(FCPATH_DEF) $(INCLUDES)
 
 LIBBASE=libfontconfig.so
 LIBFILE=$(LIBBASE).@PACKAGE_MAJOR@.@PACKAGE_MINOR@
@@ -66,3 +71,6 @@ LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@
 LIBFONTCONFIG=-L$(SRCDIR) -lfontconfig
 
 SRCDIR=$(TOPDIR)/src
+
+INCDIR=$(TOPDIR)/fontconfig
+HEADERS=$(INCDIR)/fontconfig.h $(INCDIR)/fcfreetype.h $(INCDIR)/fcprivate.h