mxe/src/zlib-1-win32-static.patch

32 lines
1.3 KiB
Diff
Raw Normal View History

This file is part of mingw-cross-env.
See doc/index.html for further information.
2010-04-20 16:49:41 +01:00
diff -r 5a13d390f989 Makefile.in
--- a/Makefile.in Tue Apr 20 14:59:46 2010 +0200
+++ b/Makefile.in Tue Apr 20 17:46:22 2010 +0200
@@ -167,8 +167,8 @@
-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
- cp $(STATICLIB) $(DESTDIR)$(libdir)
- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
+ [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir)
+ [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
diff -r 5a13d390f989 configure
--- a/configure Tue Apr 20 14:59:46 2010 +0200
+++ b/configure Tue Apr 20 17:46:22 2010 +0200
@@ -122,10 +122,7 @@
CYGWIN* | Cygwin* | cygwin* | OS/2*)
EXE='.exe' ;;
MINGW*|mingw*)
-# temporary bypass
rm -f $test.[co] $test $test$shared_ext
- echo "Please use win32/Makefile.gcc instead."
- exit 1
LDSHARED=${LDSHARED-"$cc -shared"}
LDSHAREDLIBC=""
EXE='.exe' ;;