Update for cygport source package subdir

Cygport hasn't dropped source package contents directly in /usr/src for a while
Also tweak examples for X server versions >=1.10

diff --git a/cg/programming-distribution.xml b/cg/programming-distribution.xml
index 2d07e28f52248997d8b30047fca8e0f4f1c966f7..aba43f45b9f8fff0b49dc62fbc85057c57a0ddca 100644 (file)
--- a/cg/programming-distribution.xml
+++ b/cg/programming-distribution.xml
@@ -23,11 +23,11 @@ sources, cygwin-ports git or an X.Org release tarball instead.
 </listitem>
 
 <listitem>
-<para>Invoke cygport on the .cygport file contained in the source package installed above.  This will create the source and binary packages <filename>xorg-server-n.n.n-X-src.tar.bz2</filename> and <filename>xorg-server-n.n.n-X.tar.bz2</filename>
+<para>Invoke cygport on the .cygport file contained in the source package installed above.  This will create the source and binary packages <filename>xorg-server-n.nn.n-X-src.tar.bz2</filename> and <filename>xorg-server-n.nn.n-X.tar.bz2</filename>
 
 <screen>
-&cygwin-bash-prompt; /usr/src
-$ cygport xorg-server-x.x.x-x.cygport all
+&cygwin-bash-prompt; /usr/src/xorg-server-x.xx.x-x.src/
+$ cygport xorg-server-x.xx.x-x.cygport all
 </screen>
 </para>
 

diff --git a/cg/programming-obtaining-source.xml b/cg/programming-obtaining-source.xml
index 9865a3105a607638b5f25121862faf97e1191801..a5c42b9e46107e802aa2ed6f5e3814388c06f8dc 100644 (file)
--- a/cg/programming-obtaining-source.xml
+++ b/cg/programming-obtaining-source.xml
@@ -39,20 +39,21 @@ The sources can unpacked and prepared using cygport as follows:
 
 <screen>
 &cygwin-bash-prompt; ~
-$ cd /usr/src
+$ cd /usr/src/xorg-server-n.nn.n-n.src
 
-&cygwin-bash-prompt; /usr/src
-$ cygport xorg-server-n.n.n-n.cygport prep
+&cygwin-bash-prompt; /usr/src/xorg-server-n.nn.n-n.src
+$ cygport xorg-server-n.nn.n-n.cygport prep
 [lots of output as archive is unpacked and patches applied]
 
-$ cygport xorg-server-n.n.n-n.cygport compile
+&cygwin-bash-prompt; /usr/src/xorg-server-n.nn.n-n.src
+$ cygport xorg-server-n.nn.n-n.cygport compile
 [lots of output as source is configured and built]
 
-&cygwin-bash-prompt; /usr/src
-$ cd xorg-server-n.n.n-n/src/xorg-server-n.n.n/
+&cygwin-bash-prompt; /usr/src/xorg-server-n.nn.n-n.src
+$ cd xorg-server-n.nn.n-n/src/xorg-server-n.nn.n/
 [navigate to the source directory]
 
-&cygwin-bash-prompt; /usr/src/xorg-server-n.n.n-n/src/xorg-server-n.n.n/
+&cygwin-bash-prompt; /usr/src/xorg-server-n.nn.n-n/src/xorg-server-n.nn.n/
 $
 </screen>