* buildscripts/install-info-html.sh: Use Bash.

* cygwin/mknetrel: Patch from Bert.

diff --git a/ChangeLog b/ChangeLog
index 2603e559a3b9897fcdbf7fbaadb7345806aee0b3..d5526e218ee353794a44a14aca30c90e8d23c66f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-01  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * buildscripts/install-info-html.sh: Use Bash.
+
+       * cygwin/mknetrel: Patch from Bert.
+
 2003-09-30  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * cygwin/lily-wins.py: Check whether to run ly2dvi or lilypond.

diff --git a/buildscripts/install-info-html.sh b/buildscripts/install-info-html.sh
index cc5f19dbf2f1031fb21bc0040f9cc7de352f2ee5..f4df714b76864eae08bff500c9ed32f0db43ed8e 100644 (file)
--- a/buildscripts/install-info-html.sh
+++ b/buildscripts/install-info-html.sh
@@ -1,4 +1,4 @@
-#!@SHELL@
+#!@BASH@
 
 name=install-info-html
 version=1.0

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 3435d1cc1e16db36d9c5167e42f3a6dc9709c52c..49954d4f5f73bbfd5eff1c47e85e18a8d3a8f3e5 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -142,12 +142,11 @@ postinstall () {
     cd $src || exit 1
     install -d -m755 $inst/$packagedocdir
 
-    ## Generic READMEs -- too crude!
-    ## find . -maxdepth 1 -type f -exec install -m644 \{\} \
-    ##   $inst/$packagedocdir \;
-    
-    install -m644 AUTHORS.txt COPYING ChangeLog DEDICATION INSTALL.txt \
-       NEWS.txt README.txt THANKS VERSION $inst/$packagedocdir
+    install -m644  COPYING ChangeLog DEDICATION THANKS VERSION $inst/$packagedocdir
+
+    # txt files reside elsewhere
+    cd $build/Documentation/topdocs/out
+    install -m644 AUTHORS.txt INSTALL.txt NEWS.txt README.txt $inst/$packagedocdir
 
     ## Cygwin readmes
     cygwin=cygwin
@@ -162,7 +161,9 @@ postinstall () {
     ## copy examples
     cd $src || exit 1
     cp -prv input $inst/$packagedocdir
+       cd $inst/$packagedocdir
+       rm -rf $(find -name 'CVS')
 
-    cd $inst-doc/$packagedocdir &&
-    ln -s $(find html/Documentation -name '*.ps.gz') .
+    #cd $inst-doc/$packagedocdir &&
+    #ln -s $(find html/Documentation -name '*.ps.gz') .
 }

diff --git a/cygwin/mknetrel.split b/cygwin/mknetrel.split
index 1506b3d9f23425f68edb635d645438ea127c4245..a2ce0cb9e61e4a66dece02608697746c9ea411ef 100644 (file)
--- a/cygwin/mknetrel.split
+++ b/cygwin/mknetrel.split
@@ -44,7 +44,7 @@ devel_split () {
 
 doc_split () {
     mkdir -p ./$docprefix || exit 1
-    mv $inst/$infodir ./$infodir
+    #mv $inst/$infodir ./$infodir
     true
 }