# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1324406369 -3600
# Node ID 10271bbbb793e4b7a87da725ff916960e43c5aa0
# Parent  02c93d1f00d7d73e2ae46d49ed85e114efc76213# Parent  bd523dbc7033998ea7dea44be8e43e43e2ced377
Merge #432 and #433 to branch 1.2

diff -r 02c93d1f00d7 -r 10271bbbb793 doc/Makefile.am
--- a/doc/Makefile.am	Tue Dec 20 19:10:50 2011 +0100
+++ b/doc/Makefile.am	Tue Dec 20 19:39:29 2011 +0100
@@ -11,6 +11,8 @@
 	doc/min_cost_flow.dox \
 	doc/named-param.dox \
 	doc/namespaces.dox \
+	doc/references.bib \
+	doc/template.h \
 	doc/html \
 	doc/CMakeLists.txt
 
diff -r 02c93d1f00d7 -r 10271bbbb793 lemon/CMakeLists.txt
--- a/lemon/CMakeLists.txt	Tue Dec 20 19:10:50 2011 +0100
+++ b/lemon/CMakeLists.txt	Tue Dec 20 19:39:29 2011 +0100
@@ -57,6 +57,7 @@
 INSTALL(
   TARGETS lemon
   ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
   COMPONENT library
 )