# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 2011-12-20 19:35:47
# Node ID cfdbf1574403ef260c7e6185b91a7e7e5e62ede3
# Parent  a1fd7008a052105a3566e6ac96711c3d010aec99
# Parent  53c0dd3870013b9225857b51b13d4dc5c6b435ef

Merge

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
 )