summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Muck <christian.muck@bmw.de>2011-10-19 11:14:17 +0200
committerChristian Muck <christian.muck@bmw.de>2011-10-19 11:14:17 +0200
commit49950e52ecf214c9c2df68af558f9dabab2c78f9 (patch)
tree2df2e0ee884b570516a6672324807c89a67ff832
parent3cb29486899ddf04a01f737d8f8e5603d90b2883 (diff)
downloadDLT-daemon-49950e52ecf214c9c2df68af558f9dabab2c78f9.tar.gz
Removed installation of LICENSE.txt in a directory called dlt2
-rwxr-xr-xCMakeLists.txt3
-rw-r--r--automotive-dlt.spec.cmake6
-rw-r--r--automotive-dlt.spec.in5
-rwxr-xr-xdistfiles1
4 files changed, 1 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e85528..3df960f 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,9 +227,6 @@ ENDIF(ENABLE_BUILD_DOC)
INSTALL(FILES automotive-dlt.pc
DESTINATION lib/pkgconfig
COMPONENT devel)
-INSTALL(FILES LICENSE.txt
- DESTINATION doc/dlt2
- COMPONENT base)
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
diff --git a/automotive-dlt.spec.cmake b/automotive-dlt.spec.cmake
index 3c1e84a..8c000bf 100644
--- a/automotive-dlt.spec.cmake
+++ b/automotive-dlt.spec.cmake
@@ -78,12 +78,6 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/dlt-example-user-func
%{_bindir}/dlt-example-filetransfer
-
-
-%files doc
-%{_usr}/doc/dlt2/LICENSE.txt
-
-
%files devel
%{_libdir}/pkgconfig/*.pc
%{_includedir}/dlt/*.h
diff --git a/automotive-dlt.spec.in b/automotive-dlt.spec.in
index ca73f1b..6f4038d 100644
--- a/automotive-dlt.spec.in
+++ b/automotive-dlt.spec.in
@@ -81,14 +81,11 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/dlt-test-stress-user
%{_bindir}/dlt-test-internal
%{_bindir}/dlt-test-filetransfer
-%attr(0755,root,root)
-%{_bindir}/dlt-daemon
+%attr(0755,root,root) %{_bindir}/dlt-daemon
%{_bindir}/dlt-example-user
%{_bindir}/dlt-example-user-func
%{_bindir}/dlt-example-filetransfer
-%files doc
-%{_usr}/doc/dlt2/LICENSE.txt
%files devel
diff --git a/distfiles b/distfiles
index 1d79045..70e40d4 100755
--- a/distfiles
+++ b/distfiles
@@ -12,7 +12,6 @@ automotive-dlt.spec.in
cmake_uninstall.cmake.in
[^/]*\.cmake
.*\.xpm
-LICENSE.txt
README
src/daemon/dlt.conf
src/system/dlt-system.conf