(construct_children): call

[lilypond.git] / cygwin / mknetrel.split

diff --git a/cygwin/mknetrel.split b/cygwin/mknetrel.split
index 1506b3d9f23425f68edb635d645438ea127c4245..e804e545ec0d9aa8843d7f52453c09a11bfeec8f 100644 (file)
--- a/cygwin/mknetrel.split
+++ b/cygwin/mknetrel.split
@@ -21,30 +21,38 @@ doc_name () {
 lib_split () {
     mkdir -p ./$prefix/bin || exit 1
     mv $inst/$prefix/bin/*.dll ./$prefix/bin
-    # dlopen-able .la files go in BIN dir, lib package
+    # dlopen-able .la files go in BIN dir, BIN OR LIB package
     mkdir -p ./$prefix/bin || exit 1
     mv $inst/$prefix/lib/lib*[0-9]*.la ./$prefix/bin
     mkdir -p ./$prefix/share || exit 1
     mv $inst/$prefix/share/$base ./$prefix/share
+    rmdir $inst/prefix/bin || true
+    rmdir $inst/prefix/lib || true
+    rmdir $inst/prefix/share || true
     true
 }
    
 devel_split () {
     mkdir -p ./$prefix/bin || exit 1
-    mv $inst/$prefix/include ./$prefix/include
+    tar -C $inst -cf - ./$prefix/include | tar -xf -
+    rm -rf $inst/$prefix/include
+    # Only static .a libs in devel, load time .la files go in LIB or
+    # BIN package.
     mkdir -p ./$prefix/lib || exit 1
     mv $inst/$prefix/lib/*.a ./$prefix/lib
-    # link time .la files go in LIB dir devel package
-    mkdir -p ./$prefix/lib || exit 1
-    mv $inst/$prefix/lib/*.la ./$prefix/lib
     mkdir -p ./$prefix/share || exit 1
-    mv $inst/$prefix/share/aclocal ./$prefix/share
+    tar -C $inst -cf - ./$prefix/share/aclocal | tar -xf -
+    rm -rf $inst/$prefix/share/aclocal
+    rmdir $inst/prefix/lib || true
+    rmdir $inst/prefix/share || true
     true
 }
 
 doc_split () {
     mkdir -p ./$docprefix || exit 1
-    mv $inst/$infodir ./$infodir
+    mkdir -p ./$infodir || exit 1
+    tar -C $inst -cf - ./$infodir | tar -xf -
+    rm -rf $inst/$infodir
     true
 }