summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog.txt2
-rw-r--r--Makefile6
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