Synchronised line endinge with release branch

1 files changed, 76 insertions, 76 deletions

diff --git a/fontconfig/config/Makedefs.in b/fontconfig/config/Makedefs.in
index 8cfb9e785..ae75aff49 100644
--- a/fontconfig/config/Makedefs.in
+++ b/fontconfig/config/Makedefs.in
@@ -1,76 +1,76 @@
-#

-# fontconfig/config/Makedefs.in

-#

-# 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

-# the above copyright notice appear in all copies and that both that

-# copyright notice and this permission notice appear in supporting

-# documentation, and that the name of the author(s) not be used in

-# advertising or publicity pertaining to distribution of the software without

-# specific, written prior permission.  The authors make no

-# representations about the suitability of this software for any purpose.  It

-# is provided "as is" without express or implied warranty.

-#

-# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

-# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR

-# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

-# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

-# PERFORMANCE OF THIS SOFTWARE.

-#

-

-SHELL = @SHELL@

-

-srcdir=@srcdir@

-prefix=@prefix@

-exec_prefix=@exec_prefix@

-libdir=@libdir@

-bindir=@bindir@

-datadir=@datadir@

-includedir=@includedir@

-sysconfdir=@sysconfdir@

-confdir=@confdir@

-

-DSO_LDOPTS=@DSO_LDOPTS@

-DSO_CFLAGS=@DSO_CFLAGS@

-DSO_PIC_CFLAGS=@DSO_PIC_CFLAGS@

-

-INSTALL=@INSTALL@

-INSTALL_PROGRAM=@INSTALL_PROGRAM@

-INSTALL_SCRIPT=@INSTALL_SCRIPT@

-INSTALL_DATA=@INSTALL_DATA@

-MKSHLIB=@MKSHLIB@

-LN_S=@LN_S@

-

-# shared libraries

-LIBDIR=$(libdir)

-# programs

-BINDIR=$(bindir)

-# font configuration files

-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@

-LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@

-

-LIBFONTCONFIG=-L$(SRCDIR) -lfontconfig

-

-SRCDIR=$(TOPDIR)/src

-

-INCDIR=$(TOPDIR)/fontconfig

-HEADERS=$(INCDIR)/fontconfig.h $(INCDIR)/fcfreetype.h $(INCDIR)/fcprivate.h

+#
+# fontconfig/config/Makedefs.in
+#
+# 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
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of the author(s) not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission.  The authors make no
+# representations about the suitability of this software for any purpose.  It
+# is provided "as is" without express or implied warranty.
+#
+# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+
+SHELL = @SHELL@
+
+srcdir=@srcdir@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+datadir=@datadir@
+includedir=@includedir@
+sysconfdir=@sysconfdir@
+confdir=@confdir@
+
+DSO_LDOPTS=@DSO_LDOPTS@
+DSO_CFLAGS=@DSO_CFLAGS@
+DSO_PIC_CFLAGS=@DSO_PIC_CFLAGS@
+
+INSTALL=@INSTALL@
+INSTALL_PROGRAM=@INSTALL_PROGRAM@
+INSTALL_SCRIPT=@INSTALL_SCRIPT@
+INSTALL_DATA=@INSTALL_DATA@
+MKSHLIB=@MKSHLIB@
+LN_S=@LN_S@
+
+# shared libraries
+LIBDIR=$(libdir)
+# programs
+BINDIR=$(bindir)
+# font configuration files
+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@
+LIBMAJOR=$(LIBBASE).@PACKAGE_MAJOR@
+
+LIBFONTCONFIG=-L$(SRCDIR) -lfontconfig
+
+SRCDIR=$(TOPDIR)/src
+
+INCDIR=$(TOPDIR)/fontconfig
+HEADERS=$(INCDIR)/fontconfig.h $(INCDIR)/fcfreetype.h $(INCDIR)/fcprivate.h