# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 2011-12-20 19:37:25
# Node ID bed8011dc6ad8a82ffaa34bf958b6fadff52fb69
# Parent  fe5718b39fdada6e25b9b38a75635b04dd818c42
# Parent  53c0dd3870013b9225857b51b13d4dc5c6b435ef

Merge #432 and #433 to branch 1.1

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
 )