summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-12-27 20:25:07 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-12-27 20:25:07 +0000
commitcc9eeac8b32f3026656e18eb3104b4db27f94ac1 (patch)
tree62b7f43f40d3d20bda4598a3d5c1b6b2ddfda4d4
parente6409296e58e867fb0527e7c318f2de72e89a520 (diff)
downloadATCD-cc9eeac8b32f3026656e18eb3104b4db27f94ac1.tar.gz
ChangeLogTag: Tue Dec 27 12:24:29 2005 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/Makefile.am2
2 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 32ae2fe0cb4..18e0ada24a6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Tue Dec 27 12:24:29 2005 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * Makefile.am:
+
+ Fixed botched ACLOCAL_AMFLAGS definition.
+
Tue Dec 27 11:34:29 2005 J.T. Conklin <jtc@acorntoolworks.com>
* Makefile.am:
diff --git a/TAO/Makefile.am b/TAO/Makefile.am
index fc7650f87c6..c9bf23fb7a4 100644
--- a/TAO/Makefile.am
+++ b/TAO/Makefile.am
@@ -21,6 +21,6 @@ SUBDIRS = \
ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I ../m4
AUTOMAKE_OPTIONS = foreign