[xserver-commit] cygwin-x-doc/common Makefile.in,1.1.1.1,1.2

[Harold L Hunt II]

Committed by: harold

Update of /cvs/xserver/cygwin-x-doc/common
In directory pdx:/tmp/cvs-serv1606/common

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/common/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- a/Makefile.in	5 Sep 2003 17:39:52 -0000	1.1.1.1
+++ b/Makefile.in	29 Feb 2004 23:36:11 -0000	1.2
@@ -63,6 +63,7 @@
 HAVE_LIB = @HAVE_LIB@
 JADE = @JADE@
 LIB = @LIB@
+LN_S = @LN_S@
 LTLIB = @LTLIB@
 MAKEINFO = @MAKEINFO@
 NSGMLS = @NSGMLS@
@@ -82,9 +83,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps common/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign common/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
 
@@ -97,6 +98,11 @@
 subdir = common
 
 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 common/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \