From 52d4357afb7fcf69e7163b4d2b8dd368c30c6656 Mon Sep 17 00:00:00 2001 From: amber Date: Thu, 16 Dec 2004 03:55:53 +0000 Subject: update git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@580 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog.txt | 2 ++ Makefile | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index e5b404038..78d61bc53 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,7 @@ Date Added 12/16 + * Fixed a misuse of mysql_config (thanks Daegalus for + creating a reproducable environment for me) [MouseJstr] * Fixed compile time errors for gcc 2.95 [MouseJstr] * Added #itemlist, removed @charitemlist [MC Cameri] * Changed @job and #job so that when it's used it unequips all the items, to prevent sprite errors [MC Cameri] diff --git a/Makefile b/Makefile index 9317bdcf8..e6b79229e 100644 --- a/Makefile +++ b/Makefile @@ -34,10 +34,10 @@ ifeq ($(findstring /,$(MYSQLFLAG_CONFIG)), /) MYSQLFLAG_VERSION = $(shell $(MYSQLFLAG_CONFIG) --version | sed s:\\..*::) endif -ifeq ($(findstring 5,$(MYSQLFLAG_VERSION)), 5) -MYSQLFLAG_CONFIG_ARGUMENT = --include -endif ifeq ($(findstring 4,$(MYSQLFLAG_VERSION)), 4) +MYSQLFLAG_CONFIG_ARGUMENT = --cflags +endif +ifeq ($(findstring 5,$(MYSQLFLAG_VERSION)), 5) MYSQLFLAG_CONFIG_ARGUMENT = --include endif ifndef MYSQLFLAG_CONFIG_ARGUMENT -- cgit v1.2.3-70-g09d2