Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Tue, 20 Dec 2011 19:35:47 +0100
changeset 969cfdbf1574403
parent 965 a1fd7008a052
parent 968 53c0dd387001
child 970 bd523dbc7033
Merge
doc/Makefile.am
     1.1 --- a/doc/Makefile.am	Tue Dec 20 18:15:38 2011 +0100
     1.2 +++ b/doc/Makefile.am	Tue Dec 20 19:35:47 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:15:38 2011 +0100
     2.2 +++ b/lemon/CMakeLists.txt	Tue Dec 20 19:35:47 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