summaryrefslogtreecommitdiff
path: root/lib/opencdk/Makefile.am
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-07-07 14:10:29 +0200
committerSimon Josefsson <simon@josefsson.org>2008-07-07 14:10:29 +0200
commit26cdb90cdb68cc5e5ac110b5a2bc4341f3293dbd (patch)
treecd00a688d06eb36aa23f25352e453e9e092acb2d /lib/opencdk/Makefile.am
parenta0cb2f19139388aa3432ab05aaba471057e3ecc6 (diff)
parentd768f45a6a476410295fafc90259ab36c6ffdc15 (diff)
downloadgnutls_2_5_with_shishi.tar.gz
Merge branch 'master' into gnutls_2_5_with_shishignutls_2_5_with_shishi
Conflicts: NEWS configure.in
Diffstat (limited to 'lib/opencdk/Makefile.am')
-rw-r--r--lib/opencdk/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/opencdk/Makefile.am b/lib/opencdk/Makefile.am
index 4dcfeafdc8..b54ba907fa 100644
--- a/lib/opencdk/Makefile.am
+++ b/lib/opencdk/Makefile.am
@@ -20,7 +20,7 @@
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA
-INCLUDES = -I$(top_srcdir)/lib \
+AM_CPPFLAGS = -I$(top_srcdir)/lib \
-I$(top_srcdir)/includes -I$(top_builddir)/includes \
-I$(top_srcdir)/lgl -I$(top_builddir)/lgl