X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cygwin%2Fmknetrel.libtool;h=4745d6573688b4e5686b931c09db154270a9faae;hb=345f102a8f2f8511c696d785b828c608a912e928;hp=d28bf08376fa4ecfbd5ac52306bf3682f507e6f7;hpb=6c5d515458662449d657837349a0da00450194db;p=lilypond.git

diff --git a/cygwin/mknetrel.libtool b/cygwin/mknetrel.libtool
index d28bf08376..4745d65736 100644
--- a/cygwin/mknetrel.libtool
+++ b/cygwin/mknetrel.libtool
@@ -37,8 +37,16 @@ fix_libtool_la () {
 	    for j in $(ls -1 *.la); do
 		sed -i~ \
 		    -e 's/ *-L *[^"'"'"' ][^"'"'"' ]*//g'\
-		    -e "s@\( \|=\)\(/usr/lib/lib\)@\1$cygwin_root\2@g"\
+		    -e "s@\( \|=\|'\)\(/[^ ]*usr/lib/lib\)\([^ ']*\)\.\(a\|la\|so\)[^ ']*@\1-l\3@g"\
 		    $j
+##		    -e "s@\( \|=\|'\)\(cyg\)\([^ ']*\)\(\.dll.a\|.a\)[^ ']*@\1lib\3\4@g"\
+##		    -e "s@\( \|=\|'\)\(/usr/lib/lib\)\([^ ']*\)\.\(a\|la\|so\)[^ ']*@\1-l\3@g"\
+##		    -e "s@\( \|=\|'\)\(/usr/lib/lib\)\([^.]*\)\.\(a\|la\|so\)[^ ']*@\1-l\3@g"\
+##		    -e "s@\( \|=\|'\)\(/usr/lib/lib\)\([^.]*\)[^ ']*@\1-l\3@g"\
+##		    -e "s@\( \|=\|'\)\(/usr/lib/\)\(lib\)@\1\3@g"\
+##		    -e "s@\( \|=\)\(/usr/lib/lib\)@\1$cygwin_root\2@g"\
+##		    -e "s@\( \|=\)\(/usr/lib/lib\)@\1$cygwin_root\2@g"\
+##		    -e "s@\( \|=\)\(/usr/lib/lib\)\([^ ]*\)[.]\(a\|dll\|la\|so[^ ]*\)@-l\2@g"\
 	    done
 	fi
     done
@@ -49,7 +57,9 @@ fix_libtool_la () {
     # more libtool fixups.  I love libtool.
     sed -i~ \
 	-e "s@^dlname=.*@dlname='../bin/$dll_prefix$base-$sover.dll'@" \
-	-e "s@^library_names=.*@library_names='$dll_prefix$base.dll.a'@" \
-	-e "s@^old_library=.*@old_library='$dll_prefix$base.a'@" \
+	-e "s@^library_names=.*@library_names='lib$base.dll.a'@" \
+	-e "s@^old_library=.*@old_library='lib$base.a'@" \
 	$inst/$prefix/lib/lib$base.la
+##	-e "s@^library_names=.*@library_names='$dll_prefix$base.dll.a'@" \
+##	-e "s@^old_library=.*@old_library='$dll_prefix$base.a'@" \
 }