summaryrefslogtreecommitdiff
path: root/strings/Makefile.am
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-07-06 00:06:11 +0200
committerunknown <kent@mysql.com>2005-07-06 00:06:11 +0200
commitad0516d91e5b41286bbadc716a350b244ad8337e (patch)
tree1adb92a14ccbe505c0035f0f41b8f01c288979b0 /strings/Makefile.am
parent711464a11de68abe5835a74a41f7c347a1e93b67 (diff)
parentb0a6a8e13780182a172b2c0a5b6ef008b6d0645f (diff)
downloadmariadb-git-ad0516d91e5b41286bbadc716a350b244ad8337e.tar.gz
Merge
BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09: Auto merged BitKeeper/deleted/.del-Makefile.am~41238af048e60515: Auto merged mysql-test/Makefile.am: Auto merged netware/Makefile.am: Auto merged tests/Makefile.am: Auto merged vio/Makefile.am: SCCS merged
Diffstat (limited to 'strings/Makefile.am')
-rw-r--r--strings/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am
index a98908ad54a..5e02c7c1a2b 100644
--- a/strings/Makefile.am
+++ b/strings/Makefile.am
@@ -16,7 +16,7 @@
# This file is public domain and comes with NO WARRANTY of any kind
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
pkglib_LIBRARIES = libmystrings.a
# Exact one of ASSEMBLER_X