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,6 @@ # $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency # list at the bottom of this makefile. -CC=gcc ifdef MINGW MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw @@ -43,13 +43,12 @@ # Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h ifndef prefix -prefix=/usr -$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr") +prefix=££PREFIX££ endif # Where the zlib library and include files are located -ZLIBLIB= /usr/lib -ZLIBINC= +ZLIBLIB= ££PREFIX££/lib +ZLIBINC= ££PREFIX££/include #ZLIBLIB=../zlib #ZLIBINC=../zlib @@ -94,7 +94,9 @@ LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz MKDIR=/bin/mkdir -pv +ifndef RANLIB RANLIB=ranlib +endif #RANLIB=echo INCPATH=$(prefix)/include @@ -173,7 +173,7 @@ $(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $< $(STATLIB): $(OBJS) - ar rc $@ $(OBJS) + $(AR) rc $@ $(OBJS) $(RANLIB) $@ $(SHAREDDEF): projects/msvc/png32ms.def