Changeset 52bee9c

Timestamp:

Apr 18, 2013, 3:38:47 PM (11 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

60e8617 (diff), 487cc2b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 487cc2b1b658bcc696e3951201320be455fc86e4 into 60e8617904bd9d4cfd97f15d5ec92e713962db99

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)

Makefile.am

@@ -109 +109 @@
     barnowl-wrapper.in \
     codelist.pl \
-    doc \
+    doc/code.txt \
+    doc/owl-window.txt \
+    doc/releasing-barnowl.txt \
     examples \
     marshal_types \

configure.ac

@@ -2 +2 @@
 AC_INIT([BarnOwl],[1.10dev],[bug-barnowl@mit.edu])
 AM_INIT_AUTOMAKE([1.7.0 -Wall -Wno-portability foreign])
+AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
@@ -185 +186 @@
 AC_REPLACE_FUNCS([memrchr])
 
+AC_SUBST([abs_builddir])
+AC_SUBST([abs_srcdir])
+
 AC_CONFIG_FILES([Makefile compat/Makefile libfaim/Makefile perl/Makefile perl/modules/Makefile])
 AC_OUTPUT