X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=db-mysql%2FMakefile;h=f85ecb02c2724b5a7ae00a6a1e00bc5a0182fbc4;hp=552b1f30a85e63715860f0a1cbc0c2861ed61c18;hb=e7a577db720298ca6152c2da92f4aed647ee43c8;hpb=244328d6a2b108b8d4448df06034ca088e313440

diff --git a/db-mysql/Makefile b/db-mysql/Makefile
index 552b1f3..f85ecb0 100644
--- a/db-mysql/Makefile
+++ b/db-mysql/Makefile
@@ -27,7 +27,7 @@ shared64_lib=$(base)64.so
 all: $(shared_lib)
 
 CFLAGS=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include
-LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/mysql/lib32 -L/usr/local/lib/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/opt/local/lib/mysql5/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc
+LDFLAGS=-L/usr/local/lib64/mysql -L/usr/local/lib/mysql -L/usr/lib64/mysql -L/usr/lib/mysql -L/sw/lib -L/opt/local/lib/mysql -L/opt/local/lib/mysql5/mysql -L/usr/local/mysql/lib -L/usr/lib/gcc/i686-pc-cygwin/3.4.4 -lmysqlclient -lz -lc
 
 CFLAGS32=-I /usr/local/include/mysql -I /usr/include/mysql -I /sw/include/mysql -I /opt/local/include/mysql -I /opt/local/include/mysql5/mysql -I /usr/local/mysql/include -m32
 LDFLAGS32=-L/lib32 -L/usr/lib32 -melf_i386 -lmysqlclient -lz -lc
@@ -60,8 +60,8 @@ else
 	  ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared64_lib)
 	  rm $(object)
 	  @echo "Ensure that you have multiarch i386 build tools and libraries if you want to build 32-bit library"
-	  gcc $(CFLAGS32) -fPIC -c $(source) -o $(object)
-	  ld -shared -soname=$(base) $(object) $(LDFLAGS32) -o $(shared_lib)
+	  -gcc $(CFLAGS32) -fPIC -c $(source) -o $(object)
+	  -ld -shared -soname=$(base) $(object) $(LDFLAGS32) -o $(shared_lib)
         else
 	  gcc $(CFLAGS) -fPIC -c $(source) -o $(object)
 	  ld -shared -soname=$(base) $(object) $(LDFLAGS) -o $(shared_lib)
@@ -70,7 +70,7 @@ else
     endif
   endif
 endif
-	rm $(object)
+	rm -f $(object)
 
 .PHONY: distclean
 distclean: clean