From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Mon, 22 Jul 2002 01:13:38 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/1.5.69~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=13fe5048471baf733ffd7cecfeb95bd266a77167;p=lilypond.git

*** empty log message ***
---

diff --git a/cygwin/GNUmakefile b/cygwin/GNUmakefile
index 3cf0ac0c0b..60cc067dc3 100644
--- a/cygwin/GNUmakefile
+++ b/cygwin/GNUmakefile
@@ -38,7 +38,8 @@ INSTALLATION_OUT_SUFFIXES=1 2
 # The cygwin profile.d dir, however, is in /etc
 
 # avoid collapsed directory constructs '//'
-etc=$(dir $(patsubst %/, %, $(dir $(prefix))))etc
+#etc=$(dir $(patsubst %/, %, $(dir $(prefix)/)))etc
+etc=$(patsubst %/, %, $(dir $(prefix)))/etc
 INSTALLATION_DIR=$(etc)/postinstall
 INSTALLATION_FILES=$(OUT_POST_INSTALLS)
 
diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index df8099c002..6dd829d46b 100644
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -11,8 +11,8 @@
 cat >/dev/null <<EOC
 
    wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.5/lilypond-1.5.68.tar.gz
-   rm -rf /home/mknetrel/netrel/src/lilypond-*
-   mkdir -p /home/mknetrel/netrel/src && cd /home/mknetrel/netrel/src
+   rm -rf /home/netrel/src/lilypond-*
+   mkdir -p /home/netrel/src && cd /home/netrel/src
    ## TODO: look at pimport
    tar xzf /var/tmp/lilypond-*
    mv lilypond-* $(echo lilypond-*)-1
@@ -301,8 +301,11 @@ prebuild () {
 	cp -pv $i $(dirname $(dirname $i))/$(basename $i)
     done
 
-    addmakeflags LDFLAGS="$cygwin_prefix/bin/libpython2.2.dll"
+    addmakeflags LDFLAGS="$cygwin_prefix/bin/libpython2.2.dll" " " 'target=i686-pc-cygwin'
+}
 
+preinstall () {
+    addmakeflags LDFLAGS="$cygwin_prefix/bin/libpython2.2.dll" " " 'target=i686-pc-cygwin'
 }
 
 postinstall () {
@@ -316,18 +319,18 @@ postinstall () {
     ## copy READMEs etc
 
     cd $src || exit 1
-    
-    mkdir -p $inst/$docdir
+    install -d -m755 $inst/$docdir
 
     ## Generic READMEs
     find . -maxdepth 1 -type f -exec cp -pv \{\} $inst/$docdir \;
 
-    ## Windows readmes
-    cd cygwin || exit 1
-    cp -p README $inst/$docdir/README.Cygwin
-    cp -p changelog $inst/$docdir/changelog.Cygwin
-    mkdir -p $inst/$prefix/doc/Cygwin
-    cp -p README $inst/$prefix/doc/Cygwin/$base-$ver.README
+    ## Cygwin readmes
+    cygwin=cygwin
+    cd $src || exit 1
+    install -m644 $cygwin/README $inst/$docdir/README.Cygwin
+    install -m644 $cygwin/changelog $inst/$docdir/changelog.Cygwin
+    install -d -m755 $inst/$prefix/doc/Cygwin
+    install -m644 $cygwin/README $inst/$prefix/doc/Cygwin/$package.README
 
     ## copy examples
     cd $src || exit 1
diff --git a/cygwin/zlily-profile.sh b/cygwin/zlily-profile.sh
index 5cb824c3db..8a7919d7e2 100644
--- a/cygwin/zlily-profile.sh
+++ b/cygwin/zlily-profile.sh
@@ -29,7 +29,9 @@ export WINDOWS_TEXINPUTS WINDOWS_TFMFONTS WINDOWS_MFINPUTS
 # PATH="/usr/lilypond/bin:$PATH"
 # PATH="@prefix@/bin:$PATH"
 
-cat <<EOF
+# Can't do this in Cygwin :-(
+
+cat > /dev/null <<EOF
 Congratulations and welcome to GNU LilyPond.
 
 To get started, visit: