Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / stepmake / bin / package-zip32.sh

diff --git a/stepmake/bin/package-zip32.sh b/stepmake/bin/package-zip32.sh
index 164faa151943f21066ab9733eafb163c893abb7a..75039f950424a76c4fc08dd09882af70722d4890 100644 (file)
--- a/stepmake/bin/package-zip32.sh
+++ b/stepmake/bin/package-zip32.sh
@@ -38,9 +38,12 @@ fi
 
 distdir=/tmp/${name}
 
-rm -f ${srcdir}/config.cache
-PYTHON=${PYTHON:-python} ${srcdir}/configure --prefix=${distdir} \
-    --srcdir=${srcdir}
+#
+# Maybe we can get away without reconfiguring
+#
+# rm -f ${srcdir}/config.cache
+# PYTHON=${PYTHON:-python} ${srcdir}/configure --prefix=${distdir} \
+#     --srcdir=${srcdir}
 
 if ! make ; then
     echo "make failed"
@@ -48,15 +51,20 @@ if ! make ; then
 fi
 
 # failure allowed
-make -C Documentation info
+#make -C Documentation info
 
 if ! make install ; then
     echo "make install failed"
     exit 1
 fi
 
-if ! make -C Documentation/man WWW ; then
-    echo "make -C documentation/man WWW failed"
+#if ! make -C Documentation/man WWW ; then
+#    echo "make -C documentation/man WWW failed"
+#    exit 1
+#fi
+
+if ! make -C Documentation/ntweb WWW ; then
+    echo "make -C documentation/ntweb WWW failed"
     exit 1
 fi
 
@@ -100,15 +108,28 @@ cp -r $GUILE_SCM $distdir/share/lilypond
 #
 # Rename python files to <filename>.py
 #
-mv $distdir/bin/ly2dvi $distdir/bin/ly2dvi.py
+mv $distdir/bin/lilypond $distdir/bin/lilypond.py
 mv $distdir/bin/convert-mudela $distdir/bin/convert-mudela.py
 mv $distdir/bin/mudela-book $distdir/bin/mudela-book.py
 
 #
 # copy man documentation to doc directory
 #
-mkdir $distdir/doc
-cp Documentation/man/out/*.html $distdir/doc
+#mkdir $distdir/doc
+#cp Documentation/man/out/*.html $distdir/doc
+
+#
+# copy web documentation to web directory
+#
+mkdir $distdir/web
+for i in index.html guile-1.3.4-gnu-windows.patch angels.ly
+do
+  cp Documentation/ntweb/out/$i $distdir/web || exit 1
+done
+
+#
+# Zip it up
+#
 cd $distdir/..
 $ZIP_CMD $ZIP_FILE $name
 echo "Wrote $ZIP_FILE"