[xserver-commit] cygwin-x-doc/faq cygwin-x-faq.xml,NONE,1.1 Makefile.am,1.2,1.3 Makefile.in,1.3,1.4 cygwin-xfree-faq.xml,1.16,NONE

Harold L Hunt II xserver-commit@pdx.freedesktop.org


Committed by: harold

Update of /cvs/xserver/cygwin-x-doc/faq
In directory pdx:/tmp/cvs-serv10011/faq

Modified Files:
	Makefile.am Makefile.in 
Added Files:
	cygwin-x-faq.xml 
Removed Files:
	cygwin-xfree-faq.xml 
Log Message:
Fix problems with install target for documentation.  Final cleanups to allow the package to be distributed in binary form.

--- NEW FILE: cygwin-x-faq.xml ---
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" [

<!-- Include the common entities -->
<!ENTITY % common SYSTEM "../common/entities.xml"> %common;

<!-- System entities -->
<!ENTITY general SYSTEM "general.xml">
<!ENTITY installation SYSTEM "install.xml">
<!ENTITY configuration SYSTEM "config.xml">
<!ENTITY usage SYSTEM "usage.xml">
<!ENTITY troubleshooting SYSTEM "trouble.xml">
<!ENTITY errors SYSTEM "errors.xml">
<!ENTITY remote SYSTEM "remote.xml">
<!ENTITY i18n SYSTEM "i18n.xml">
<!ENTITY contributing SYSTEM "contrib.xml">
<!ENTITY license-ptc SYSTEM "licptc.xml">
<!ENTITY porting SYSTEM "porting.xml">
<!ENTITY biblio SYSTEM "biblio.xml">
<!ENTITY glossary SYSTEM "glossary.xml">

<!-- Document title entities -->
<!ENTITY title-general "General Information">
<!ENTITY title-installation "Installation">
<!ENTITY title-configuration "Configuration">
<!ENTITY title-usage "Usage">
<!ENTITY title-troubleshooting "Troubleshooting">
<!ENTITY title-errors "Error and Warning Messages">
<!ENTITY title-porting "Porting Software">
<!ENTITY title-contributing "Contributing">
<!ENTITY title-license-ptc "Licenses, Patents, Trademarks, and Copyrights">
<!ENTITY title-biblio "Bibliography">
<!ENTITY title-glossary "Glossary">

<!-- United States Patent and Trademark Office entities -->
<!ENTITY uspto "United States Patent and Trademark Office">
<!ENTITY uspto-home "http://www.uspto.gov/">

<!-- Free Software Foundation entities -->
<!ENTITY fsf-url-licenses
"http://www.fsf.org/philosophy/license-list.html#GPLCompatibleLicenses">

<!-- Emacs entities -->
<!ENTITY emacs-url-ntemacs
"http://www.gnu.org/software/emacs/windows/ntemacs.html">
<!ENTITY emacs-url-mirrors
"http://www.gnu.org/order/ftp.html">
<!ENTITY emacs-dir-ntemacs "gnu/windows/emacs/">
<!ENTITY xemacs-url-download "http://xemacs.org/Download/index.html">

<!-- xkeycaps entities -->
<!ENTITY xkeycaps-home "http://www.jwz.org/xkeycaps/">

<!-- GCC entities -->
<!ENTITY gcc-home "http://gcc.gnu.org">
<!ENTITY gcc-cross-url "http://www.objsw.com/CrossGCC/">

<!-- Miscellaneous company names -->
<!ENTITY starnet "StarNet Communications">
<!ENTITY linux "GNU/Linux">

<!-- Answers That Work -->
<!ENTITY atw "Answers That Work">
<!ENTITY atw-home "http://www.answersthatwork.com/">
<!ENTITY atw-url-tasklist-a "http://www.answersthatwork.com/Tasklist_pages/tasklist_a.htm">
<!ENTITY atw-title-tasklist-a "Task List Programs - A">
]>

<article class="faq" id="cygwin-x-faq">

<articleinfo id="article-info">

<date>2001-05-22</date>
<title>&project; Frequently Asked Questions</title>

<author>
<firstname>Harold</firstname>
<othername role="mi">L</othername>
<surname>Hunt</surname>
<lineage>II</lineage>
</author>

<legalnotice id="legal-notice">
<blockquote id="legal-notice-quote"><para> Copyright (c) 2001 Harold L
Hunt II.  Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
Version 1.1 or any later version published by the Free Software
Foundation; with no Invariant Sections, with no Front-Cover Texts, and
with no Back-Cover Texts.  A copy of the license is included in the
section entitled "GNU Free Documentation License".
</para></blockquote>
</legalnotice>

<revhistory id="revision-history">

<revision>
<revnumber>1.0.14</revnumber>
<date>2004-03-08</date>
<authorinitials>alexander.gottwald@s1999.tu-chemnitz.de</authorinitials>
<revremark>Changed the OpenSSH config file location.
Reported by tulitanssi &lt;at&gt; luukku &lt;dot&gt; com
Marked Alt-Gr with XP Powertoys as solved.
Added section about wrong AltGr key name.</revremark>
</revision>

<revision>
<revnumber>1.0.13</revnumber>
<date>2004-02-29</date>
<authorinitials>alexander.gottwald@s1999.tu-chemnitz.de</authorinitials>
<revremark>Replaced XF86Config with the new commandline options.</revremark>
</revision>

<revision>
<revnumber>1.0.12</revnumber>
<date>2004-02-28</date>
<authorinitials>alexander.gottwald@s1999.tu-chemnitz.de</authorinitials>
<revremark>Added ForwardX11Trusted to ssh section.</revremark>
</revision>

<revision>
<revnumber>1.0.11</revnumber>
<date>2004-01-04</date>
<authorinitials>alexander.gottwald@s1999.tu-chemnitz.de</authorinitials>
<revremark>Restructured keyboard and remote questions to own sections.</revremark>
</revision>

<revision>
<revnumber>1.0.10</revnumber>
<date>2003-12-29</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Remove more old entries.</revremark>
</revision>

<revision>
<revnumber>1.0.9</revnumber>
<date>2003-12-29</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Remove old entries about Xinstall.sh.</revremark>
</revision>

<revision>
<revnumber>1.0.8</revnumber>
<date>2003-12-22</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Updated XDMCP entries and kdmrc locations.</revremark>
</revision>

<revision>
<revnumber>1.0.7</revnumber>
<date>2003-12-18</date>
<authorinitials>alexander.gottwald@s1999.tu-chemnitz.de</authorinitials>
<revremark>Added troubleshooting info for Microsoft Services for Unix.</revremark>
</revision>

<revision>
<revnumber>1.0.6</revnumber>
<date>2003-12-06</date>
<authorinitials>alexander.gottwald@s1999.tu-chemnitz.de</authorinitials>
<revremark>Added troubleshooting info for Ctrl-Alt-BackSpace and AutoFocus.</revremark>
</revision>

<revision>
<revnumber>1.0.5</revnumber>
<date>2003-12-05</date>
<authorinitials>alexander.gottwald@s1999.tu-chemnitz.de</authorinitials>
<revremark>Added troubleshooting info for AltGr problem with Windows XP and Powertoys.
Added troubleshooting for very poor performance.</revremark>
</revision>

<revision>
<revnumber>1.0.4</revnumber>
<date>2003-09-05</date>
<authorinitials>alexander.gottwald@s1999.tu-chemnitz.de</authorinitials>
<revremark>Updated the entries about non U.S. keyboard layouts.
Added troubleshooting info for X11Forwarding and keyboard layouts.</revremark>
</revision>

<revision>
<revnumber>1.0.3</revnumber>
<date>2003-03-28</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Revised q&amp;a entries for showing 8-bit chars in bash and
for enabling XDMCP on remote machines.</revremark>
</revision>

<revision>
<revnumber>1.0.2</revnumber>
<date>2002-05-26</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Add a q&amp;a for TrackPoint mouse wheel
emulation.</revremark>
</revision>


<revision>
<revnumber>1.0.1</revnumber>
<date>2001-10-22</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Added a q&amp;a's to the &title-usage;
section, contributed by Mika Laitio, regarding why &mandrake; 8.1
doesn't display an XDMCP login screen.</revremark>
</revision>


<revision>
<revnumber>1.0.0</revnumber>
<date>2001-10-19</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Added a q&amp;a to the &title-errors; section for the
cygncurses5.dll problem.  Added three q&amp;a's to the &title-porting;
section.  Bumped the revision number to 1.0.0 to indicate that all
planned content is now present.</revremark>
</revision>


<revision>
<revnumber>0.0.3</revnumber>
<date>2001-06-10</date>
<authorinitials>huntharo@msu.edu</authorinitials>

<revremark>Added a q&amp;a to the &title-installation; section
regarding web browsers that automatically decompress bzip2 files.
Updated the answer for the error message STATUS_INTEGER_DIVIDE_BY_ZERO
to indicate that 8 bit color is now supported.</revremark>
</revision>


<revision>
<revnumber>0.0.2</revnumber>
<date>2001-06-03</date>
<authorinitials>huntharo@msu.edu</authorinitials>
</revision>


<revision>
<revnumber>0.0.1</revnumber>
<date>2001-05-23</date>
<authorinitials>huntharo@msu.edu</authorinitials>
</revision>


<revision>
<revnumber>0.0.0</revnumber>
<date>2001-05-22</date>
<authorinitials>huntharo@msu.edu</authorinitials>
</revision>

</revhistory>

</articleinfo>

<sect1 id="qanda"><title>Questions and Answers</title>
<qandaset>

&general;
&installation;
&configuration;
&usage;
&i18n;
&remote;
&troubleshooting;
&errors;
&porting;
&contributing;
&license-ptc;

</qandaset>
</sect1>

&biblio;
&glossary;
&fdl;

<!-- Template question and answer. 
<qandaentry>
<question>
<para></para>
</question>
<answer>
<para></para>
</answer>
</qandaentry>
-->

</article>

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/faq/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/Makefile.am	4 Jan 2004 15:31:43 -0000	1.2
+++ b/Makefile.am	10 Mar 2004 00:52:01 -0000	1.3
@@ -10,7 +10,7 @@
 
 ## Source files
 
-faq_xml_source = cygwin-xfree-faq.xml
+faq_xml_source = cygwin-x-faq.xml
 extra_faq_xml_source = biblio.xml \
 	config.xml \
 	contrib.xml \
@@ -44,22 +44,22 @@
 
 ## Files generated by other builds
 
-extra_faq_ps = cygwin-xfree-faq.ps
-extra_faq_ps_gz = cygwin-xfree-faq.ps.gz
-extra_faq_pdf = cygwin-xfree-faq.pdf
-extra_faq_txt = cygwin-xfree-faq.txt
-extra_faq_rtf = cygwin-xfree-faq.rtf
-extra_faq_dvi = cygwin-xfree-faq.dvi
-extra_faq_tex = cygwin-xfree-faq.tex
+extra_faq_ps = cygwin-x-faq.ps
+extra_faq_ps_gz = cygwin-x-faq.ps.gz
+extra_faq_pdf = cygwin-x-faq.pdf
+extra_faq_txt = cygwin-x-faq.txt
+extra_faq_rtf = cygwin-x-faq.rtf
+extra_faq_dvi = cygwin-x-faq.dvi
+extra_faq_tex = cygwin-x-faq.tex
 
-faqdir = $(pkgdatadir)/faq
-faq_DATA = cygwin-xfree-faq.html $(extra_faq_html) $(extra_faq_ps_gz) \
+faqdir = $(docdir)/faq
+faq_DATA = cygwin-x-faq.html $(extra_faq_html) $(extra_faq_ps_gz) \
 	$(extra_faq_pdf) $(extra_faq_txt) $(extra_faq_rtf)
 EXTRA_DIST = $(faq_xml_source) $(extra_faq_xml_source)
 
 ## Dependency rules follow
 
-cygwin-xfree-faq.html $(extra_faq_html): $(HTML_SS) $(faq_xml_source)	\
+cygwin-x-faq.html $(extra_faq_html): $(HTML_SS) $(faq_xml_source)	\
 	$(extra_faq_xml_source) $(ENTITIES) $(FDL)
 
 $(extra_faq_tex): $(faq_xml_source) $(extra_faq_xml_source)
@@ -79,7 +79,8 @@
 ## General rules follow
 
 clean-local:
-	rm -f *.htm *.html *.dvi *.tex *.ps *.pdf *.txt *.log *.aux *.rtf *.gz
+	rm -f *.htm *.html *.dvi *.tex *.ps *.pdf \
+	*.txt *.log *.aux *.rtf *.gz *.out
 
 validate:
 	$(NSGMLS) -wmin-tag -s $(srcdir)/$(faq_xml_source)
@@ -115,19 +116,17 @@
 $(extra_faq_pdf):
 	dvipdf -f $< > $@
 
-cygwin-xfree-faq.html:
+cygwin-x-faq.html:
 	$(SHELL) -c "$(NSGMLS) -wmin-tag -s $< && $(JADE) -t xml -ihtml \
 	-d $(HTML_SS) -o $@ $(XML_DECL) $(srcdir)/$(faq_xml_source)"
 
 $(extra_faq_txt):
 	$(JADE) -t xml -V nochunks \
 		-d $(HTML_SS) \
-		$(XML_DECL) $(srcdir)/cygwin-xfree-faq.xml > dump.html
+		$(XML_DECL) $(srcdir)/cygwin-x-faq.xml > dump.html
 	lynx -force_html -dump dump.html > $@
 	-rm -f dump.html
 
 $(extra_faq_rtf):
 	$(SHELL) -c "$(JADE) -t rtf -d $(PRINT_SS) -o $@ $(XML_DECL) \
 	$(srcdir)/$(faq_xml_source)"
-
-

Index: Makefile.in
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/faq/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/Makefile.in	29 Feb 2004 23:36:11 -0000	1.3
+++ b/Makefile.in	10 Mar 2004 00:52:01 -0000	1.4
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,66 +12,84 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
-SHELL = @SHELL@
+@SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-CC = @CC@
-HAVE_LIB = @HAVE_LIB@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 JADE = @JADE@
-LIB = @LIB@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LN_S = @LN_S@
-LTLIB = @LTLIB@
+LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 NSGMLS = @NSGMLS@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
 VERSION = @VERSION@
-
+ac_ct_STRIP = @ac_ct_STRIP@
+am__leading_dot = @am__leading_dot@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+docdir = @docdir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 MAX_TEX_RECURSION = 4
 
 XML_DECL = $(srcdir)/../stylesheets/xml.dcl
@@ -80,151 +100,209 @@
 ENTITIES = $(srcdir)/../common/entities.xml
 FDL = $(srcdir)/../common/fdl.xml
 
-faq_xml_source = cygwin-xfree-faq.xml
-extra_faq_xml_source = biblio.xml 	config.xml 	contrib.xml 	errors.xml 	general.xml 	glossary.xml 	licptc.xml 	install.xml 	usage.xml 	remote.xml 	i18n.xml 	trouble.xml 	porting.xml
+faq_xml_source = cygwin-x-faq.xml
+extra_faq_xml_source = biblio.xml \
+	config.xml \
+	contrib.xml \
+	errors.xml \
+	general.xml \
+	glossary.xml \
+	licptc.xml \
+	install.xml \
+	usage.xml \
+	remote.xml \
+	i18n.xml \
+	trouble.xml \
+	porting.xml
 
 
-extra_faq_html = biblio.html 	gfdl.html 	gfdl-aggregation-with-independent-works.html 	gfdl-applicability-and-definitions.html 	gfdl-collections-of-documents.html 	gfdl-combining-documents.html 	gfdl-copying-in-quantity.html 	gfdl-future-revisions-of-this-license.html 	gfdl-modifications.html 	gfdl-termination.html 	gfdl-translation.html 	gfdl-using-for-your-documents.html 	gfdl-verbation-copying.html 	glossary.html
+extra_faq_html = biblio.html \
+	gfdl.html \
+	gfdl-aggregation-with-independent-works.html \
+	gfdl-applicability-and-definitions.html \
+	gfdl-collections-of-documents.html \
+	gfdl-combining-documents.html \
+	gfdl-copying-in-quantity.html \
+	gfdl-future-revisions-of-this-license.html \
+	gfdl-modifications.html \
+	gfdl-termination.html \
+	gfdl-translation.html \
+	gfdl-using-for-your-documents.html \
+	gfdl-verbation-copying.html \
+	glossary.html
 
 
-extra_faq_ps = cygwin-xfree-faq.ps
-extra_faq_ps_gz = cygwin-xfree-faq.ps.gz
-extra_faq_pdf = cygwin-xfree-faq.pdf
-extra_faq_txt = cygwin-xfree-faq.txt
-extra_faq_rtf = cygwin-xfree-faq.rtf
-extra_faq_dvi = cygwin-xfree-faq.dvi
-extra_faq_tex = cygwin-xfree-faq.tex
+extra_faq_ps = cygwin-x-faq.ps
+extra_faq_ps_gz = cygwin-x-faq.ps.gz
+extra_faq_pdf = cygwin-x-faq.pdf
+extra_faq_txt = cygwin-x-faq.txt
+extra_faq_rtf = cygwin-x-faq.rtf
+extra_faq_dvi = cygwin-x-faq.dvi
+extra_faq_tex = cygwin-x-faq.tex
 
-faqdir = $(pkgdatadir)/faq
-faq_DATA = cygwin-xfree-faq.html $(extra_faq_html) $(extra_faq_ps_gz) 	$(extra_faq_pdf) $(extra_faq_txt) $(extra_faq_rtf)
+faqdir = $(docdir)/faq
+faq_DATA = cygwin-x-faq.html $(extra_faq_html) $(extra_faq_ps_gz) \
+	$(extra_faq_pdf) $(extra_faq_txt) $(extra_faq_rtf)
 
 EXTRA_DIST = $(faq_xml_source) $(extra_faq_xml_source)
+subdir = faq
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-DATA =  $(faq_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(faq_DATA)
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+all: all-am
 
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign faq/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  faq/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+uninstall-info-am:
+faqDATA_INSTALL = $(INSTALL_DATA)
 install-faqDATA: $(faq_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(faqdir)
 	@list='$(faq_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(faqdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(faqdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(faqdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(faqdir)/$$p; \
-	  fi; fi; \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(faqDATA_INSTALL) $$d$$p $(DESTDIR)$(faqdir)/$$f"; \
+	  $(faqDATA_INSTALL) $$d$$p $(DESTDIR)$(faqdir)/$$f; \
 	done
 
 uninstall-faqDATA:
 	@$(NORMAL_UNINSTALL)
-	list='$(faq_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(faqdir)/$$p; \
+	@list='$(faq_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(faqdir)/$$f"; \
+	  rm -f $(DESTDIR)$(faqdir)/$$f; \
 	done
 tags: TAGS
 TAGS:
 
+ctags: CTAGS
+CTAGS:
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-subdir = faq
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign faq/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-faqDATA
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(faqdir)
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-faqDATA
-uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(faqdir)
-
 
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am clean-local
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
 
-clean: clean-am
+dvi: dvi-am
 
-distclean-am:  distclean-generic clean-am
+dvi-am:
 
-distclean: distclean-am
+info: info-am
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+info-am:
+
+install-data-am: install-faqDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
 
-.PHONY: uninstall-faqDATA install-faqDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+mostlyclean: mostlyclean-am
 
+mostlyclean-am: mostlyclean-generic
 
-cygwin-xfree-faq.html $(extra_faq_html): $(HTML_SS) $(faq_xml_source)	\
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-faqDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-local \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-faqDATA install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-faqDATA uninstall-info-am
+
+
+cygwin-x-faq.html $(extra_faq_html): $(HTML_SS) $(faq_xml_source)	\
 	$(extra_faq_xml_source) $(ENTITIES) $(FDL)
 
 $(extra_faq_tex): $(faq_xml_source) $(extra_faq_xml_source)
@@ -242,7 +320,8 @@
 $(extra_faq_rtf): $(faq_xml_source) $(extra_faq_xml_source)
 
 clean-local:
-	rm -f *.htm *.html *.dvi *.tex *.ps *.pdf *.txt *.log *.aux *.rtf *.gz
+	rm -f *.htm *.html *.dvi *.tex *.ps *.pdf \
+	*.txt *.log *.aux *.rtf *.gz *.out
 
 validate:
 	$(NSGMLS) -wmin-tag -s $(srcdir)/$(faq_xml_source)
@@ -274,21 +353,20 @@
 $(extra_faq_pdf):
 	dvipdf -f $< > $@
 
-cygwin-xfree-faq.html:
+cygwin-x-faq.html:
 	$(SHELL) -c "$(NSGMLS) -wmin-tag -s $< && $(JADE) -t xml -ihtml \
 	-d $(HTML_SS) -o $@ $(XML_DECL) $(srcdir)/$(faq_xml_source)"
 
 $(extra_faq_txt):
 	$(JADE) -t xml -V nochunks \
 		-d $(HTML_SS) \
-		$(XML_DECL) $(srcdir)/cygwin-xfree-faq.xml > dump.html
+		$(XML_DECL) $(srcdir)/cygwin-x-faq.xml > dump.html
 	lynx -force_html -dump dump.html > $@
 	-rm -f dump.html
 
 $(extra_faq_rtf):
 	$(SHELL) -c "$(JADE) -t rtf -d $(PRINT_SS) -o $@ $(XML_DECL) \
 	$(srcdir)/$(faq_xml_source)"
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

--- cygwin-xfree-faq.xml DELETED ---