X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cygwin%2Fmknetrel;h=03529b8b286b3171333eff63ac077aaca2edebf8;hb=74d1cd49cf0bfdd9f78cd7f4d7ac763b11ac541b;hp=eaaf82acf7e694e253a546dd0c94a4bb383e1a33;hpb=f9e0c125607fd81fffafc4fde07901ec83af7b0f;p=lilypond.git

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index eaaf82acf7..03529b8b28 100644
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -7,21 +7,18 @@
 # See http://lilypond.org/web/devel/packaging.html for more information,
 # report bugs to bug-lilypond@gnu.org.
 #
-#
-# Get mknetrel from here:
-#
-#   cvs -d:pserver:anoncvs@sources.redhat.com:/cvs/cygwin-apps co mknetrel
-#
-# To build the package do:
+# To build the package, do:
 cat >/dev/null <<EOC
 
-   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.9/lilypond-1.9.8.tar.gz
+   cd /
+   cvs -d:pserver:anoncvs@sources.redhat.com:/cvs/cygwin-apps co -d netrel mknetrel
+   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.9/lilypond-1.9.9.tar.gz
+   mkdir -p /netrel/src && cd /netrel/src
    rm -rf /netrel/src/lilypond-*
-   mkdir -p /netrel/src && cd /home/netrel/src
    tar xzf /var/tmp/lilypond-*
-   mv lilypond-1.9.8 lilypond-1.9.8-1
-   cd -
-   ./bin/mknetrel -xX lilypond
+   mv lilypond-1.9.9 lilypond-1.9.9-1
+   cp lilypond-1.9.9-1/cygwin/mknetrel /netrel/extra/lilypond
+   /netrel/bin/mknetrel -xX lilypond
 
 EOC
 
@@ -31,7 +28,7 @@ old_path=$PATH
 patch=$mknetrel_root/patch
 
 # for cross-compiling LilyPond:
-if !iscygwin; then
+if ! iscygwin; then
     uploads=$here/uploads/$base && mkdir -p $uploads/
     tarstem=$uploads/$package
 fi
@@ -54,14 +51,14 @@ preconfig () {
     patchsrc 
     rm -f config.cache
 
-    # for cross-compiling LilyPond:
-    if !iscygwin; then
+    # for cross-compiling LilyPond, fake a guile-config
+    if ! iscygwin; then
 	cd $build || exit 1
 	GUILE=1.6.4
 	cat > guile-config <<EOF
 [ "\$1" == "--version" ] && echo "guile-config - Guile version $GUILE"
-[ "\$1" == "compile" ] && echo "-I$cygwin_prefix/include"
-[ "\$1" == "link" ] && echo "-L$cygwin_prefix/lib -lguile"
+[ "\$1" == "compile" ] && echo "-I$cygwin_root/usr/include"
+[ "\$1" == "link" ] && echo "-L$cygwin_root/usr/lib -lguile"
 exit 0
 EOF
 	chmod 755 guile-config
@@ -71,7 +68,7 @@ EOF
 
 postconfig () {
     # cross-compiling: configure for build-host
-    if !iscygwin; then
+    if ! iscygwin; then
 	rm -f config.cache
 	export HOST_CC=gcc
 	export HOST_CXX=g++
@@ -96,38 +93,22 @@ prebuild () {
     done
     
     # cross-compiling: build for build-host, generate doc
-    if !iscygwin; then
+    if ! iscygwin; then
 	cd $build || exit 1
 
 	PATH=/bin:/usr/bin:$PATH \
-	    PYTHONPATH=$build/python/out-for-build:$PYTHONPATH \
 	    make conf=for-build all doc web || exit 1
 	
-        # as of 1.9.9, this should no longer be necessary:
-	for i in $(find . -path ".*out-for-build/*.1"); do
-	    o=$(dirname $(dirname $i))/out
-	    mkdir -p $o
-	    cp -pv $i $o/$(basename $i)
-	done
-
 	mkdir -p mf/out
 	cp -pv mf/out-for-build/* mf/out
     fi
     
-    addmakeflags MAKE_PFA_FILES=1 ' ' LDFLAGS="$cygwin_prefix/bin/libpython2.3.dll" ' ' 'target=i686-pc-cygwin'
+    addmakeflags MAKE_PFA_FILES=1 ' ' LDFLAGS="$cygwin_root/usr/bin/libpython2.3.dll" ' ' 'target=i686-pc-cygwin'
 }
 
 preinstall () {
 
-    # cross-compiling: fix manual pages
-    if !iscygwin; then
-        # as of 1.9.9, this should no longer be necessary:
-	cd $build || exit 1
-	cp -v scripts/out-for-build/midi2ly.1 scripts/out
-	cp -v lily/out-for-build/lilypond.1 lily/out
-    fi
-    
-    addmakeflags MAKE_PFA_FILES=1 ' ' LDFLAGS="$cygwin_prefix/bin/libpython2.3.dll" ' ' 'target=i686-pc-cygwin'
+    addmakeflags MAKE_PFA_FILES=1 ' ' LDFLAGS="$cygwin_root/usr/bin/libpython2.3.dll" ' ' 'target=i686-pc-cygwin'
 }
 
 postinstall () {
@@ -143,8 +124,12 @@ postinstall () {
     cd $src || exit 1
     install -d -m755 $inst/$packagedocdir
 
-    ## Generic READMEs
-    find . -maxdepth 1 -type f -exec cp -pv \{\} $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
 
     ## Cygwin readmes
     cygwin=cygwin