Mercurial > mxe-octave

comparison src/zlib-win32-static.patch @ 879:bdee1b1fe95c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade package zlib
author Volker Grabsch <vog@notjusthosting.com>
date Tue, 20 Apr 2010 17:49:41 +0200
parents
children da255d7986bb
comparison
equal deleted inserted replaced
878:49ecbb512ff2 879:bdee1b1fe95c
1 diff -r 5a13d390f989 Makefile.in
2 --- a/Makefile.in Tue Apr 20 14:59:46 2010 +0200
3 +++ b/Makefile.in Tue Apr 20 17:46:22 2010 +0200
4 @@ -167,8 +167,8 @@
5 -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
6 -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
7 -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
8 - cp $(STATICLIB) $(DESTDIR)$(libdir)
9 - cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
10 + [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir)
11 + [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
12 cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
13 -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
14 -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
15 diff -r 5a13d390f989 configure
16 --- a/configure Tue Apr 20 14:59:46 2010 +0200
17 +++ b/configure Tue Apr 20 17:46:22 2010 +0200
18 @@ -122,10 +122,7 @@
19 CYGWIN* | Cygwin* | cygwin* | OS/2*)
20 EXE='.exe' ;;
21 MINGW*|mingw*)
22 -# temporary bypass
23 rm -f $test.[co] $test $test$shared_ext
24 - echo "Please use win32/Makefile.gcc instead."
25 - exit 1
26 LDSHARED=${LDSHARED-"$cc -shared"}
27 LDSHAREDLIBC=""
28 EXE='.exe' ;;