[xserver-commit] cygwin-x-doc/faq Makefile.in,1.2,1.3

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-serv1606/faq

Modified Files:
	Makefile.in 
Log Message:
Finally do a proper implementation for building when builddir != srcdir for an arbitrary builddir.

Index: Makefile.in
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/faq/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/Makefile.in	4 Jan 2004 15:31:43 -0000	1.2
+++ b/Makefile.in	29 Feb 2004 23:36:11 -0000	1.3
@@ -63,6 +63,7 @@
 HAVE_LIB = @HAVE_LIB@
 JADE = @JADE@
 LIB = @LIB@
+LN_S = @LN_S@
 LTLIB = @LTLIB@
 MAKEINFO = @MAKEINFO@
 NSGMLS = @NSGMLS@
@@ -80,7 +81,7 @@
 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
+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
@@ -112,9 +113,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps faq/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign faq/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -146,6 +147,11 @@
 subdir = faq
 
 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); \
 	  if test -d $$d/$$file; then \