[sr-dev] git:master:487d4160: db_mysql: fixing include in Makefile for many paths

Daniel-Constantin Mierla miconda at gmail.com
Mon Dec 29 21:25:36 CET 2014


Module: kamailio
Branch: master
Commit: 487d4160b99a1a5ea48751d2f7404cb08e1f4546
URL: https://github.com/kamailio/kamailio/commit/487d4160b99a1a5ea48751d2f7404cb08e1f4546

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2014-12-29T21:23:01+01:00

db_mysql: fixing include in Makefile for many paths

- sed matching should break at whitespace, to fix the case when
  mysql_config returns multiple include paths
- reported by FS#503

---

Modified: modules/db_mysql/Makefile

---

Diff:  https://github.com/kamailio/kamailio/commit/487d4160b99a1a5ea48751d2f7404cb08e1f4546.diff
Patch: https://github.com/kamailio/kamailio/commit/487d4160b99a1a5ea48751d2f7404cb08e1f4546.patch

---

diff --git a/modules/db_mysql/Makefile b/modules/db_mysql/Makefile
index d720f22..3d99764 100644
--- a/modules/db_mysql/Makefile
+++ b/modules/db_mysql/Makefile
@@ -21,7 +21,7 @@ endif
 
 ifneq ($(MYSQLCFG),)
 	# use autodetection
-	DEFS += $(shell $(MYSQLCFG) --include | sed 's/\(-I.*\)\/mysql/\1/g' )
+	DEFS += $(shell $(MYSQLCFG) --include | sed 's/\(-I[^ ]*\)\/mysql/\1/g' )
 	LIBS = $(shell $(MYSQLCFG) --libs)
 else
 	# mysql.h locations (freebsd,openbsd  solaris)




More information about the sr-dev mailing list