[dss-commits] digitalSTROM Server branch, master, updated. bc15c4a25967ebfe5c4e8ff112c35eee5a5afd10

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM Server".

The branch, master has been updated
       via  bc15c4a25967ebfe5c4e8ff112c35eee5a5afd10 (commit)
      from  2d34b1660646ed2d0999d389beb2f4c4399f2744 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bc15c4a25967ebfe5c4e8ff112c35eee5a5afd10
Author: Johannes Winkelmann <johannes.winkelmann at aizo.com>
Date:   Tue Dec 15 11:25:19 2009 +0100

    adapt install target for WEBROOTDIR/CONFIGDIR

-----------------------------------------------------------------------

Changes:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7050537..6f24bcd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,10 +164,22 @@ ENDIF(WITH_TESTS)
 
 ADD_EXECUTABLE(dss main.cpp namespaces.cpp)
 
+## -- install targets:
 INSTALL(TARGETS dss RUNTIME DESTINATION bin)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION ${WITH_DATADIR}
-        PATTERN "/webroot/js/lib/extjs/docs" EXCLUDE
-        PATTERN "/webroot/js/lib/extjs/examples" EXCLUDE
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/
+		  DESTINATION ${WITH_DATADIR}
+		  PATTERN "webroot" EXCLUDE
+		  PATTERN "*.xml" EXCLUDE
+		  PATTERN "*.js"
+		  )
+
+
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/webroot/ DESTINATION ${WITH_WEBROOTDIR})
+INSTALL(FILES
+          ${CMAKE_CURRENT_SOURCE_DIR}/data/config.xml
+          ${CMAKE_CURRENT_SOURCE_DIR}/data/subscriptions.xml
+          ${CMAKE_CURRENT_SOURCE_DIR}/data/sim.xml
+	DESTINATION ${WITH_CONFIGDIR}
        )
 
 


hooks/post-receive
-- 
digitalSTROM Server