Imported upstream version 1.3rc4.

[pkg-rrdtool.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index 6e3dc2c7728d8f8110dd66614c4387e9d46df9de..8c392d55201ebbf044689c0a8043655b2feafd73 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -33,12 +33,12 @@ endif
 # All library code is statically linked to avoid problems with other lib DLLs.
 # Edit the path below to point to your libpng sources or set environment var.
 ifndef LIBPNG
-LIBPNG = $(LIBBASE)/libpng-1.2.23
+LIBPNG = $(LIBBASE)/libpng-1.2.16
 endif
 # Edit the path below to point to your freetype sources or set environment var.
 ifndef LIBFT2
-#LIBFT2        = $(LIBBASE)/freetype-2.3.5
-LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.3.5
+#LIBFT2        = $(LIBBASE)/freetype-2.3.4
+LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.3.4
 endif
 # Edit the path below to point to your libart sources or set environment var.
 ifndef LIBART
@@ -53,17 +53,13 @@ endif
 ifndef DISTDIR
 DISTDIR        = rrdtool-$(RRD_VERSION_STR)-w32
 endif
-ifndef DISTARC
-DISTARC = $(DISTDIR).$(ARCEXT)
-endif
+DISTARC = $(DISTDIR).zip
 
 # Edit the path below to point to your distribution folder.
 ifndef DEVLDIR
 DEVLDIR        = rrdtool-$(RRD_VERSION_STR)-sdk-w32
 endif
-ifndef DEVLARC
-DEVLARC = $(DEVLDIR).$(ARCEXT)
-endif
+DEVLARC = $(DEVLDIR).zip
 
 # whatever...
 NO_NULL_REALLOC = 1
@@ -72,19 +68,14 @@ NO_NULL_REALLOC = 1
 ifdef METROWERKS
        CC = mwcc
 else
-       CC = $(CRPREFIX)gcc
+       CC = gcc
 endif
 # RM   = rm -f
 CP     = cp -afv
 # Here you can find a native Win32 binary of the original awk:
 # http://www.gknw.net/development/prgtools/awk.zip
 AWK    = awk
-ifndef ARCBIN
-ARCBIN = zip -qzr9
-ARCEXT = zip
-#ARCBIN        = 7za a
-#ARCEXT        = 7z
-endif
+ZIP    = zip -qzr9
 
 # must be equal to DEBUG or NDEBUG
 DB     = NDEBUG
@@ -123,8 +114,8 @@ CFLAGS      += -nostdinc -gccinc -msgstyle gcc -inline off -opt nointrinsics -proc 58
 CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support"
 CFLAGS += -w on,nounused,nounusedexpr # -ansi strict
 else
-LD     = $(CRPREFIX)gcc
-RC     = $(CRPREFIX)windres
+LD     = gcc
+RC     = windres
 LDFLAGS        = -s
 AR     = ar
 ARFLAGS        = -cq
@@ -134,7 +125,7 @@ CFLAGS      += -fno-strict-aliasing
 CFLAGS += -Wall -Wno-unused # -pedantic
 endif
 
-ifdef __MSYS__
+ifeq ($(findstring msys,$(OSTYPE)),msys)
 DL     = '
 DS     = /
 else
@@ -262,7 +253,7 @@ dist: all $(DISTDIR) $(DISTDIR)/readme.txt
        @-$(CP) $(PROOT)/NEWS $(DISTDIR)
        @-$(CP) $(PROOT)/README $(DISTDIR)
        @echo Creating $(DISTARC)
-       @$(ARCBIN) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt
+       @$(ZIP) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt
 
 dev: librrd $(DEVLDIR) $(DEVLDIR)/readme.txt
        @-mkdir $(DEVLDIR)$(DS)include
@@ -278,7 +269,7 @@ dev: librrd $(DEVLDIR) $(DEVLDIR)/readme.txt
        @-$(CP) $(PROOT)/NEWS $(DEVLDIR)
        @-$(CP) $(PROOT)/README $(DEVLDIR)
        @echo Creating $(DEVLARC)
-       @$(ARCBIN) $(DEVLARC) $(DEVLDIR)/* < $(DEVLDIR)/readme.txt
+       @$(ZIP) $(DEVLARC) $(DEVLDIR)/* < $(DEVLDIR)/readme.txt
 
 clean:
        -$(RM) -r $(OBJDIR)