svn merge "^/branches/released" .

1 files changed, 93 insertions, 65 deletions

diff --git a/libX11/specs/troffrules.in b/libX11/specs/troffrules.in
index 0cd7454b8..17e55fddd 100644
--- a/libX11/specs/troffrules.in
+++ b/libX11/specs/troffrules.in
@@ -1,65 +1,93 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-
-# Based on xc/doc/specs/*/Makefile from X11R6.9
-
-EXTRA_DIST = $(doc_sources)
-
-if HAVE_PS2PDF
-printable_format = .pdf
-else
-printable_format = .ps
-endif
-
-if BUILD_SPECS
-doc_DATA =	$(doc_sources:.ms=.txt) \
-		$(doc_sources:.ms=$(printable_format)) \
-		$(doc_sources:.ms=.html)
-
-CLEANFILES = $(doc_DATA)
-MOSTLYCLEANFILES = index.*
-
-# Pass version string as a troff string for substitution
-GROFF_DEFS = -dxV="$(PACKAGE_STRING)"
-
-# -e to run through eqn, -t to run through tbl
-GROFF_FLAGS = -e -t -ms $(GROFF_DEFS) -I$(srcdir) $(top_srcdir)/specs/macros.t
-
-SUFFIXES = .ms .ps .txt .html .pdf
-
-.ms.ps:
-	-$(AM_V_GEN) $(GROFF) -Tps $(GROFF_FLAGS) $< 2> index.$@.raw > $@
-	@if grep '^[^1-9.]' index.$@.raw | grep -v warning; then exit 1; \
-	 else test $$? -le 1; fi
-
-.ms.txt:
-	$(AM_V_GEN) env GROFF_NO_SGR=TRUE $(GROFF) -Tutf8 $(GROFF_FLAGS) \
-	 $< 2> index.$@.raw > $@
-
-.ms.html:
-	$(AM_V_GEN) $(GROFF) -Thtml $(GROFF_FLAGS) $< 2> index.$@.raw > $@
-
-.ps.pdf:
-	$(AM_V_GEN) $(PS2PDF) $< $@
-
-endif BUILD_SPECS
+#

+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.

+#

+# Permission is hereby granted, free of charge, to any person obtaining a

+# copy of this software and associated documentation files (the "Software"),

+# to deal in the Software without restriction, including without limitation

+# the rights to use, copy, modify, merge, publish, distribute, sublicense,

+# and/or sell copies of the Software, and to permit persons to whom the

+# Software is furnished to do so, subject to the following conditions:

+#

+# The above copyright notice and this permission notice (including the next

+# paragraph) shall be included in all copies or substantial portions of the

+# Software.

+#

+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+# DEALINGS IN THE SOFTWARE.

+#

+

+# Based on xc/doc/specs/*/Makefile from X11R6.9

+

+EXTRA_DIST = $(doc_sources)

+

+if HAVE_PS2PDF

+printable_format = .pdf

+else

+printable_format = .ps

+endif

+

+if ENABLE_SPECS

+if HAVE_GROFF_MS

+spec_DATA =	$(doc_sources:.ms=.txt) \

+		$(doc_sources:.ms=$(printable_format)) \

+		$(doc_sources:.ms=.html)

+specdir = $(docdir)/$(subdir)

+imagesdir = $(specdir)/images

+

+CLEANFILES = $(spec_DATA)

+MOSTLYCLEANFILES = index.*

+

+# Install html generated images for specs

+install-data-local:

+	test -z "$(imagesdir)" || $(mkdir_p) "$(DESTDIR)$(imagesdir)"

+	@d="$(srcdir)/images/"; \

+	list=`ls $$d`; \

+	for p in $$list; do \

+	  echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(imagesdir)/$$p'"; \

+	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(imagesdir)/$$p"; \

+	done;

+

+uninstall-local:

+	@if test -n $(DESTDIR)$(imagesdir); then \

+	  if test -d $(DESTDIR)$(imagesdir); then \

+	    list=`ls $(DESTDIR)$(imagesdir)`; \

+	    for p in $$list; do \

+	      echo " rm -f '$(DESTDIR)$(imagesdir)/$$p'"; \

+	      rm -f "$(DESTDIR)$(imagesdir)/$$p"; \

+	    done \

+	  fi; \

+	fi;

+

+mostlyclean-local:

+	@rm -fr images

+

+# Pass version string as a troff string for substitution

+GROFF_DEFS = -dxV="$(PACKAGE_STRING)"

+

+# -e to run through eqn, -t to run through tbl

+GROFF_FLAGS = -e -t -ms $(GROFF_DEFS) -I$(srcdir) $(top_srcdir)/specs/macros.t

+

+SUFFIXES = .ms .ps .txt .html .pdf

+

+.ms.ps:

+	-$(AM_V_GEN) $(GROFF) -Tps $(GROFF_FLAGS) $< 2> index.$@.raw > $@

+	@if grep '^[^1-9.]' index.$@.raw | grep -v warning; then exit 1; \

+	 else test $$? -le 1; fi

+

+.ms.txt:

+	$(AM_V_GEN) env GROFF_NO_SGR=TRUE $(GROFF) -Tutf8 $(GROFF_FLAGS) \

+	 $< 2> index.$@.raw > $@

+

+.ms.html:

+	$(AM_V_GEN) $(GROFF) -Thtml -P-Dimages -P-I$*-image $(GROFF_FLAGS) $< 2> index.$@.raw > $@

+

+.ps.pdf:

+	$(AM_V_GEN) $(PS2PDF) $< $@

+

+endif HAVE_GROFF_MS

+endif ENABLE_SPECS