Merge #432 and #433 to branch 1.1 1.1
authorAlpar Juttner <alpar@cs.elte.hu>
Tue, 20 Dec 2011 19:37:25 +0100
branch1.1
changeset 1116bed8011dc6ad
parent 1109 fe5718b39fda
parent 1113 53c0dd387001
child 1121 1309a803a057
Merge #432 and #433 to branch 1.1
     1.1 --- a/doc/Makefile.am	Tue Dec 20 18:59:35 2011 +0100
     1.2 +++ b/doc/Makefile.am	Tue Dec 20 19:37:25 2011 +0100
     1.3 @@ -11,6 +11,7 @@
     1.4  	doc/min_cost_flow.dox \
     1.5  	doc/named-param.dox \
     1.6  	doc/namespaces.dox \
     1.7 +	doc/template.h \
     1.8  	doc/html \
     1.9  	doc/CMakeLists.txt
    1.10  
     2.1 --- a/lemon/CMakeLists.txt	Tue Dec 20 18:59:35 2011 +0100
     2.2 +++ b/lemon/CMakeLists.txt	Tue Dec 20 19:37:25 2011 +0100
     2.3 @@ -57,6 +57,7 @@
     2.4  INSTALL(
     2.5    TARGETS lemon
     2.6    ARCHIVE DESTINATION lib
     2.7 +  LIBRARY DESTINATION lib
     2.8    COMPONENT library
     2.9  )
    2.10