* extras/contrib/src/Makefile, extras/contrib/src/Patches/libpng-1.2.5-win32.patch...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 20aa37a957d03831a1d3741160c0aad16f11ca92..0128bf1a51706e9dc381dbe475cbc3f053785f8a 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1315,9 +1315,9 @@ ifdef HAVE_DARWIN_OS
        (cd $<; cp scripts/makefile.macosx Makefile && make && make install)
 else
 ifdef HAVE_WIN32
-       (cd $<; cp scripts/makefile.cygwin Makefile && make && make install)
+       (cd $<; rm -f INSTALL; cp scripts/makefile.cygwin Makefile && make $(HOSTCC) && make install)
 else
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make   && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 endif
        $(INSTALL_NAME)
 endif 

diff --git a/extras/contrib/src/Patches/libpng-1.2.5-win32.patch b/extras/contrib/src/Patches/libpng-1.2.5-win32.patch
index 043189917de46adfaa7f792322c5f0dd1931b92b..9fa7943eeb33ae7d3b5edb38447a9ed4131120d4 100644 (file)
--- a/extras/contrib/src/Patches/libpng-1.2.5-win32.patch
+++ b/extras/contrib/src/Patches/libpng-1.2.5-win32.patch
@@ -1,12 +1,11 @@
 diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
 --- scripts/makefile.cygwin    2002-10-03 12:32:34.000000000 +0100
 +++ scripts/makefile.cygwin    2003-07-25 11:03:42.000000000 +0100
-@@ -35,7 +35,7 @@
+@@ -35,7 +35,6 @@
  # $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
  # list at the bottom of this makefile.
  
 -CC=gcc
-+CC=i586-mingw32msvc-gcc
  ifdef MINGW
  MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
  MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
@@ -27,12 +26,13 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
  #ZLIBLIB=../zlib
  #ZLIBINC=../zlib
  
-@@ -94,7 +94,7 @@
+@@ -94,7 +94,9 @@
  LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
  
  MKDIR=/bin/mkdir -pv
--RANLIB=ranlib
-+RANLIB=i586-mingw32msvc-ranlib
++ifndef RANLIB
+ RANLIB=ranlib
++endif
  #RANLIB=echo
  
  INCPATH=$(prefix)/include
@@ -41,7 +41,7 @@ diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
  
  $(STATLIB): $(OBJS)
 -      ar rc $@ $(OBJS)
-+      i586-mingw32msvc-ar rc $@ $(OBJS)
++      $(AR) rc $@ $(OBJS)
        $(RANLIB) $@
  
  $(SHAREDDEF): projects/msvc/png32ms.def