[Lemon-commits] Alpar Juttner: Merge

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/cfdbf1574403
changeset: 1114:cfdbf1574403
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Tue Dec 20 19:35:47 2011 +0100
description:
	Merge

diffstat:

 doc/Makefile.am      |  1 +
 lemon/CMakeLists.txt |  1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diffs (22 lines):

diff --git a/doc/Makefile.am b/doc/Makefile.am
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -11,6 +11,7 @@
 	doc/min_cost_flow.dox \
 	doc/named-param.dox \
 	doc/namespaces.dox \
+	doc/template.h \
 	doc/html \
 	doc/CMakeLists.txt
 
diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt
--- a/lemon/CMakeLists.txt
+++ b/lemon/CMakeLists.txt
@@ -57,6 +57,7 @@
 INSTALL(
   TARGETS lemon
   ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
   COMPONENT library
 )