[xserver-commit] cygwin-x-doc/ug Makefile.am,1.1.1.1,1.2 Makefile.in,1.1.1.1,1.2 setup.xml,1.3,1.4
Harold L Hunt II
xserver-commit@pdx.freedesktop.org
Committed by: harold
Update of /cvs/xserver/cygwin-x-doc/ug
In directory pdx:/tmp/cvs-serv1606/ug
Modified Files:
Makefile.am Makefile.in setup.xml
Log Message:
Finally do a proper implementation for building when builddir != srcdir for an arbitrary builddir.
Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- a/Makefile.am 5 Sep 2003 17:37:21 -0000 1.1.1.1
+++ b/Makefile.am 29 Feb 2004 23:36:11 -0000 1.2
@@ -1,4 +1,4 @@
-SUBDIRS=figures
+SUBDIRS=figures .
MAX_TEX_RECURSION=4
@@ -58,18 +58,28 @@
## Figure list for dependencies
-figures_eps = figures/cyi01welcome.ps figures/cyi02installoption.ps \
- figures/cyi03installto.ps figures/cyi04directory.ps \
- figures/cyi05proxy.ps figures/cyi06mirror.ps \
- figures/cyi07packages.ps figures/cyi08downloading.ps \
- figures/cyi09installing.ps figures/cyi10createicons.ps \
+figures_eps = figures/cyi01welcome.ps \
+ figures/cyi02installoption.ps \
+ figures/cyi03installto.ps \
+ figures/cyi04directory.ps \
+ figures/cyi05proxy.ps \
+ figures/cyi06mirror.ps \
+ figures/cyi07packages.ps \
+ figures/cyi08downloading.ps \
+ figures/cyi09installing.ps \
+ figures/cyi10createicons.ps \
figures/cyi11complete.ps
-figures_png = figures/cyi01welcome.png figures/cyi02installoption.png \
- figures/cyi03installto.png figures/cyi04directory.png \
- figures/cyi05proxy.png figures/cyi06mirror.png \
- figures/cyi07packages.png figures/cyi08downloading.png \
- figures/cyi09installing.png figures/cyi10createicons.png \
+figures_png = figures/cyi01welcome.png \
+ figures/cyi02installoption.png \
+ figures/cyi03installto.png \
+ figures/cyi04directory.png \
+ figures/cyi05proxy.png \
+ figures/cyi06mirror.png \
+ figures/cyi07packages.png \
+ figures/cyi08downloading.png \
+ figures/cyi09installing.png \
+ figures/cyi10createicons.png \
figures/cyi11complete.png
ugdir = $(pkgdatadir)/ug
@@ -153,6 +163,3 @@
$(extra_ug_rtf):
$(SHELL) -c "$(JADE) -t rtf -d $(PRINT_SS) -o $@ $(XML_DECL) \
$(srcdir)/$(ug_xml_source)"
-
-
-
Index: Makefile.in
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/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:37:22 -0000 1.1.1.1
+++ b/Makefile.in 29 Feb 2004 23:36:11 -0000 1.2
@@ -63,13 +63,14 @@
HAVE_LIB = @HAVE_LIB@
JADE = @JADE@
LIB = @LIB@
+LN_S = @LN_S@
LTLIB = @LTLIB@
MAKEINFO = @MAKEINFO@
NSGMLS = @NSGMLS@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
-SUBDIRS = figures
+SUBDIRS = figures .
MAX_TEX_RECURSION = 4
@@ -96,10 +97,10 @@
extra_ug_dvi = cygwin-xfree-ug.dvi
extra_ug_tex = cygwin-xfree-ug.tex
-figures_eps = figures/cyi01welcome.ps figures/cyi02installoption.ps figures/cyi03installto.ps figures/cyi04directory.ps figures/cyi05proxy.ps figures/cyi06mirror.ps figures/cyi07packages.ps figures/cyi08downloading.ps figures/cyi09installing.ps figures/cyi10createicons.ps figures/cyi11complete.ps
+figures_eps = figures/cyi01welcome.ps figures/cyi02installoption.ps figures/cyi03installto.ps figures/cyi04directory.ps figures/cyi05proxy.ps figures/cyi06mirror.ps figures/cyi07packages.ps figures/cyi08downloading.ps figures/cyi09installing.ps figures/cyi10createicons.ps figures/cyi11complete.ps
-figures_png = figures/cyi01welcome.png figures/cyi02installoption.png figures/cyi03installto.png figures/cyi04directory.png figures/cyi05proxy.png figures/cyi06mirror.png figures/cyi07packages.png figures/cyi08downloading.png figures/cyi09installing.png figures/cyi10createicons.png figures/cyi11complete.png
+figures_png = figures/cyi01welcome.png figures/cyi02installoption.png figures/cyi03installto.png figures/cyi04directory.png figures/cyi05proxy.png figures/cyi06mirror.png figures/cyi07packages.png figures/cyi08downloading.png figures/cyi09installing.png figures/cyi10createicons.png figures/cyi11complete.png
ugdir = $(pkgdatadir)/ug
@@ -120,9 +121,9 @@
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps ug/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign ug/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
@@ -240,6 +241,11 @@
subdir = ug
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 ug/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
Index: setup.xml
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/ug/setup.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/setup.xml 9 Nov 2003 23:34:33 -0000 1.3
+++ b/setup.xml 29 Feb 2004 23:36:11 -0000 1.4
@@ -59,7 +59,7 @@
<mediaobject>
<imageobject>
-<imagedata fileref="../../ug/figures/cyi01welcome.ps"
+<imagedata fileref="figures/cyi01welcome.ps"
format="PS"></imagedata>
</imageobject>
<imageobject>
@@ -85,7 +85,7 @@
<mediaobject>
<imageobject>
-<imagedata fileref="../../ug/figures/cyi02installoption.ps"
+<imagedata fileref="figures/cyi02installoption.ps"
format="PS"></imagedata>
</imageobject>
<imageobject>
@@ -115,7 +115,7 @@
default of Just Me will work fine for single user machines.</para>
<mediaobject>
<imageobject>
-<imagedata fileref="../../ug/figures/cyi03installto.ps" format="PS"></imagedata>
+<imagedata fileref="figures/cyi03installto.ps" format="PS"></imagedata>
</imageobject>
<imageobject>
<imagedata fileref="figures/cyi03installto.png"
@@ -139,7 +139,7 @@
the directory that you ran <filename>setup.exe</filename> from:</para>
<mediaobject>
<imageobject>
-<imagedata fileref="../../ug/figures/cyi04directory.ps"></imagedata>
+<imagedata fileref="figures/cyi04directory.ps"></imagedata>
</imageobject>
<imageobject>
<imagedata fileref="figures/cyi04directory.png"
@@ -163,7 +163,7 @@
Connection</guilabel> to limit the scope of download problems:</para>
<mediaobject>
<imageobject>
-<imagedata fileref="../../ug/figures/cyi05proxy.ps" format="PS"></imagedata>
+<imagedata fileref="figures/cyi05proxy.ps" format="PS"></imagedata>
</imageobject>
<imageobject>
<imagedata fileref="figures/cyi05proxy.png" format="PNG"></imagedata>
@@ -185,7 +185,7 @@
<para>Select your nearest mirror for downloading:</para>
<mediaobject>
<imageobject>
-<imagedata fileref="../../ug/figures/cyi06mirror.ps" format="PS"></imagedata>
+<imagedata fileref="figures/cyi06mirror.ps" format="PS"></imagedata>
</imageobject>
<imageobject>
<imagedata fileref="figures/cyi06mirror.png" format="PNG"></imagedata>
@@ -354,7 +354,7 @@
<mediaobject>
<imageobject>
-<imagedata fileref="../../ug/figures/cyi07packages.ps" format="PS"></imagedata>
+<imagedata fileref="figures/cyi07packages.ps" format="PS"></imagedata>
</imageobject>
<imageobject>
<imagedata fileref="figures/cyi07packages.png"
@@ -375,7 +375,7 @@
<mediaobject>
<imageobject>
-<imagedata fileref="../../ug/figures/cyi08downloading.ps" format="PS"></imagedata>
+<imagedata fileref="figures/cyi08downloading.ps" format="PS"></imagedata>
</imageobject>
<imageobject>
<imagedata fileref="figures/cyi08downloading.png"
@@ -394,7 +394,7 @@
<mediaobject>
<imageobject>
-<imagedata fileref="../../ug/figures/cyi09installing.ps" format="PS"></imagedata>
+<imagedata fileref="figures/cyi09installing.ps" format="PS"></imagedata>
</imageobject>
<imageobject>
<imagedata fileref="figures/cyi09installing.png"
@@ -413,7 +413,7 @@
<application>bash</application> shell:</para>
<mediaobject>
<imageobject>
-<imagedata fileref="../../ug/figures/cyi10createicons.ps"
+<imagedata fileref="figures/cyi10createicons.ps"
format="PS"></imagedata>
</imageobject>
<imageobject>
@@ -439,7 +439,7 @@
<mediaobject>
<imageobject>
-<imagedata fileref="../../ug/figures/cyi11complete.ps" format="PS"></imagedata>
+<imagedata fileref="figures/cyi11complete.ps" format="PS"></imagedata>
</imageobject>
<imageobject>
<imagedata fileref="figures/cyi11complete.png"