special case for xkeyval, needs both tex and generic files isntalled (reported by Mojca, 30 Mar 2007 14:55:13)

git-svn-id: svn://tug.org/texlive/trunk@4159 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 20 insertions, 13 deletions

diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index f55eefbbde2..5f29229ed9b 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -317,7 +317,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";
  'vrsion',	"print \"vrsion is nonfree, not installing\n\"",
  'wasy2',	"&MAKEflatten",
  'xfrac',	"&MAKEflatten",
- 'xkeyval',	"&MAKEflatten",
+ 'xkeyval',	"&MAKExkeyval",
  'xmltex',	"&MAKExmltex",
  'xymtex',	"&MAKExymtex",
  'xypic',	"&MAKExypic",
@@ -734,7 +734,6 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$';
  'vhistory',	'\.sty', # not hyperref.cfg
  'wasy2',	'wasyfont\.tex',
  'wordcount',	'\.tex',
- 'xkeyval',	'\.sty|\.def|\.tex',
  'zefonts',	'\.sty|\.fd',
 );
 
@@ -1811,6 +1810,14 @@ sub MAKEoberdiek {
   &MAKEcopy ();
 }
 
+sub MAKExkeyval {
+  # needs files in both latex and generic.
+  &MAKEflatten ();
+  print "\t SPECIAL $package moving .tex\n";
+  my $generic = "$DEST/tex/generic/$package/";
+  &SYSTEM ("mkdir -p $generic; mv *.tex $generic");
+}
+
 sub MAKExymtex {
  &setup;
  chdir("$DEST/doc/latex/$package");
diff --git a/Master/texmf-dist/tex/latex/xkeyval/keyval.tex b/Master/texmf-dist/tex/generic/xkeyval/keyval.tex
index 38a505abeee..38a505abeee 100644
--- a/Master/texmf-dist/tex/latex/xkeyval/keyval.tex
+++ b/Master/texmf-dist/tex/generic/xkeyval/keyval.tex
diff --git a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex b/Master/texmf-dist/tex/generic/xkeyval/pst-xkey.tex
index e2067f99909..e2067f99909 100644
--- a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex
+++ b/Master/texmf-dist/tex/generic/xkeyval/pst-xkey.tex
diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex b/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex
index ed42476ca6f..ed42476ca6f 100644
--- a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex
+++ b/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex
diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex b/Master/texmf-dist/tex/generic/xkeyval/xkvtxhdr.tex
index 5beb03c3bd2..5beb03c3bd2 100644
--- a/Master/texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex
+++ b/Master/texmf-dist/tex/generic/xkeyval/xkvtxhdr.tex
diff --git a/Master/texmf-dist/tpm/xkeyval.tpm b/Master/texmf-dist/tpm/xkeyval.tpm
index c02b6506d58..f1818dee421 100644
--- a/Master/texmf-dist/tpm/xkeyval.tpm
+++ b/Master/texmf-dist/tpm/xkeyval.tpm
@@ -3,8 +3,8 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/xkeyval.zip">
     <TPM:Name>xkeyval</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/11/25 04:07:06</TPM:Date>
-    <TPM:Version>2.5c</TPM:Version>
+    <TPM:Date>2006/11/18 19:01:00</TPM:Date>
+    <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Extension of the keyval package.</TPM:Title>
     <TPM:Description>
@@ -21,14 +21,14 @@ documents where several packages define their own sets of keys.
     <TPM:Size>694846</TPM:Size>
     <TPM:License></TPM:License>
     <TPM:Build/>
-    <TPM:RunFiles size="51302">
-texmf-dist/tex/latex/xkeyval/keyval.tex
+    <TPM:RunFiles size="51298">
+texmf-dist/tex/generic/xkeyval/keyval.tex
+texmf-dist/tex/generic/xkeyval/pst-xkey.tex
+texmf-dist/tex/generic/xkeyval/xkeyval.tex
+texmf-dist/tex/generic/xkeyval/xkvtxhdr.tex
 texmf-dist/tex/latex/xkeyval/pst-xkey.sty
-texmf-dist/tex/latex/xkeyval/pst-xkey.tex
 texmf-dist/tex/latex/xkeyval/xkeyval.sty
-texmf-dist/tex/latex/xkeyval/xkeyval.tex
 texmf-dist/tex/latex/xkeyval/xkvltxp.sty
-texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex
 texmf-dist/tex/latex/xkeyval/xkvview.sty
 texmf-dist/tpm/xkeyval.tpm
     </TPM:RunFiles>
diff --git a/Master/texmf/lists/xkeyval b/Master/texmf/lists/xkeyval
index 997a758e72d..559fc5708cd 100644
--- a/Master/texmf/lists/xkeyval
+++ b/Master/texmf/lists/xkeyval
@@ -1,13 +1,13 @@
 texmf-dist/doc/latex/xkeyval/README
 texmf-dist/doc/latex/xkeyval/xkeyval.pdf
 texmf-dist/source/latex/xkeyval/xkeyval.dtx
-texmf-dist/tex/latex/xkeyval/keyval.tex
+texmf-dist/tex/generic/xkeyval/keyval.tex
+texmf-dist/tex/generic/xkeyval/pst-xkey.tex
+texmf-dist/tex/generic/xkeyval/xkeyval.tex
+texmf-dist/tex/generic/xkeyval/xkvtxhdr.tex
 texmf-dist/tex/latex/xkeyval/pst-xkey.sty
-texmf-dist/tex/latex/xkeyval/pst-xkey.tex
 texmf-dist/tex/latex/xkeyval/xkeyval.sty
-texmf-dist/tex/latex/xkeyval/xkeyval.tex
 texmf-dist/tex/latex/xkeyval/xkvltxp.sty
-texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex
 texmf-dist/tex/latex/xkeyval/xkvview.sty
 texmf-dist/tpm/xkeyval.tpm