From dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 12 Sep 2011 11:27:51 +0200
Subject: Synchronised line endinge with release branch

---
 xorg-server/fonts.src/TTF/Makefile.am | 138 +++++++++++++++++-----------------
 1 file changed, 69 insertions(+), 69 deletions(-)

(limited to 'xorg-server/fonts.src/TTF/Makefile.am')

diff --git a/xorg-server/fonts.src/TTF/Makefile.am b/xorg-server/fonts.src/TTF/Makefile.am
index d8792cbb2..a36f565c4 100644
--- a/xorg-server/fonts.src/TTF/Makefile.am
+++ b/xorg-server/fonts.src/TTF/Makefile.am
@@ -1,69 +1,69 @@
-#  Copyright 2005 Red Hat, Inc.
-#
-#  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 Red Hat
-#  not be used in advertising or publicity pertaining to distribution
-#  of the software without specific, written prior permission.  Red
-#  Hat makes no representations about the suitability of this software
-#  for any purpose.  It is provided "as is" without express or implied
-#  warranty.
-#
-#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-#  NO EVENT SHALL RED HAT 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.
-
-FONT_FILES = \
-	luximbi.ttf \
-	luximb.ttf \
-	luximri.ttf \
-	luximr.ttf \
-	luxirbi.ttf \
-	luxirb.ttf \
-	luxirri.ttf \
-	luxirr.ttf \
-	luxisbi.ttf \
-	luxisb.ttf \
-	luxisri.ttf \
-	luxisr.ttf
-
-fontdir = @FONTDIR@
-font_DATA = $(FONT_FILES)
-
-actualconfigdir = $(FC_CONFDIR)/conf.d
-availconfigdir = $(FC_CONFDIR)/conf.avail
-dist_availconfig_DATA = 42-luxi-mono.conf
-
-EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH
-
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-
-install-data-hook:
-	@rm -f $(DESTDIR)$(fontdir)/fonts.scale
-	$(MKFONTSCALE) $(DESTDIR)$(fontdir)
-	@rm -f $(DESTDIR)$(fontdir)/font.dir
-	$(MKFONTDIR) $(DESTDIR)$(fontdir)
-	mkdir -p $(DESTDIR)$(actualconfigdir)
-	@rm -f $(DESTDIR)$(actualconfigdir)/$(dist_availconfig_DATA)
-	ln -s ../conf.avail/$(dist_availconfig_DATA) $(DESTDIR)$(actualconfigdir)
-	@RUN_FCCACHE@
-
-distuninstallcheck:
-	@:
-
-
-.PHONY: ChangeLog INSTALL
-
-INSTALL:
-	$(INSTALL_CMD)
-
-ChangeLog:
-	$(CHANGELOG_CMD)
-
-dist-hook: ChangeLog INSTALL
+#  Copyright 2005 Red Hat, Inc.
+#
+#  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 Red Hat
+#  not be used in advertising or publicity pertaining to distribution
+#  of the software without specific, written prior permission.  Red
+#  Hat makes no representations about the suitability of this software
+#  for any purpose.  It is provided "as is" without express or implied
+#  warranty.
+#
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+#  NO EVENT SHALL RED HAT 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.
+
+FONT_FILES = \
+	luximbi.ttf \
+	luximb.ttf \
+	luximri.ttf \
+	luximr.ttf \
+	luxirbi.ttf \
+	luxirb.ttf \
+	luxirri.ttf \
+	luxirr.ttf \
+	luxisbi.ttf \
+	luxisb.ttf \
+	luxisri.ttf \
+	luxisr.ttf
+
+fontdir = @FONTDIR@
+font_DATA = $(FONT_FILES)
+
+actualconfigdir = $(FC_CONFDIR)/conf.d
+availconfigdir = $(FC_CONFDIR)/conf.avail
+dist_availconfig_DATA = 42-luxi-mono.conf
+
+EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+install-data-hook:
+	@rm -f $(DESTDIR)$(fontdir)/fonts.scale
+	$(MKFONTSCALE) $(DESTDIR)$(fontdir)
+	@rm -f $(DESTDIR)$(fontdir)/font.dir
+	$(MKFONTDIR) $(DESTDIR)$(fontdir)
+	mkdir -p $(DESTDIR)$(actualconfigdir)
+	@rm -f $(DESTDIR)$(actualconfigdir)/$(dist_availconfig_DATA)
+	ln -s ../conf.avail/$(dist_availconfig_DATA) $(DESTDIR)$(actualconfigdir)
+	@RUN_FCCACHE@
+
+distuninstallcheck:
+	@:
+
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
-- 
cgit v1.2.3