From 92755d35c47b0595f10f7a40c90648f977cd3a62 Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Wed, 22 May 2013 15:21:12 -0400 Subject: [PATCH] changed license installation convention --- openbr/openbr_export.cpp | 2 +- openbr/plugins/eigen3.cmake | 2 +- openbr/plugins/mongoose.cmake | 2 +- openbr/plugins/qtnetwork.cmake | 2 +- openbr/plugins/yubico.cmake | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openbr/openbr_export.cpp b/openbr/openbr_export.cpp index 7e7ec12..a0d2138 100644 --- a/openbr/openbr_export.cpp +++ b/openbr/openbr_export.cpp @@ -58,7 +58,7 @@ $ cd bin $ export LD_LIBRARY_PATH=../lib:${LD_LIBRARY_PATH} $ sudo ldconfig -$ sudo cp ../share/70-yubikey.rules /etc/udev/rules.d # Only needed if you were given a license dongle. +$ sudo cp ../share/openbr/70-yubikey.rules /etc/udev/rules.d # Only needed if you were given a license dongle. \endverbatim * \par OS X \verbatim diff --git a/openbr/plugins/eigen3.cmake b/openbr/plugins/eigen3.cmake index cc7e257..ed6a3e2 100644 --- a/openbr/plugins/eigen3.cmake +++ b/openbr/plugins/eigen3.cmake @@ -3,5 +3,5 @@ set(BR_WITH_EIGEN3 ON CACHE BOOL "Build Eigen3 plugins") if(${BR_WITH_EIGEN3}) find_package(Eigen3 REQUIRED) set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/eigen3.cpp) - install(FILES ${EIGEN3_LICENSE} RENAME Eigen3.license DESTINATION .) + install(FILES ${EIGEN3_LICENSE} RENAME Eigen3 DESTINATION share/openbr/licenses) endif() diff --git a/openbr/plugins/mongoose.cmake b/openbr/plugins/mongoose.cmake index dee8326..a32ea7d 100644 --- a/openbr/plugins/mongoose.cmake +++ b/openbr/plugins/mongoose.cmake @@ -2,5 +2,5 @@ set(BR_WITH_MONGOOSE OFF CACHE BOOL "Build with Mongoose") if(${BR_WITH_MONGOOSE}) find_package(Mongoose) set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/mongoose.cpp ${MONGOOSE_SRC}) - install(FILES ${MONGOOSE_LICENSE} RENAME mongoose.license DESTINATION .) + install(FILES ${MONGOOSE_LICENSE} RENAME mongoose DESTINATION share/openbr/licenses) endif() diff --git a/openbr/plugins/qtnetwork.cmake b/openbr/plugins/qtnetwork.cmake index a85e923..e2b5b3d 100644 --- a/openbr/plugins/qtnetwork.cmake +++ b/openbr/plugins/qtnetwork.cmake @@ -4,5 +4,5 @@ if(${BR_WITH_QTNETWORK}) find_package(HttpParser) set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Network) set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/qtnetwork.cpp ${HTTPPARSER_SRC}) - install(FILES ${HTTPPARSER_LICENSE} RENAME http-parser.license DESTINATION .) + install(FILES ${HTTPPARSER_LICENSE} RENAME http-parser DESTINATION share/openbr/license) endif() diff --git a/openbr/plugins/yubico.cmake b/openbr/plugins/yubico.cmake index 913f855..8273747 100644 --- a/openbr/plugins/yubico.cmake +++ b/openbr/plugins/yubico.cmake @@ -4,9 +4,9 @@ if(${BR_WITH_YUBICO}) find_package(YubiKey REQUIRED) # For decrypting YubiKeys find_package(YKPers REQUIRED) # For reading YubiKeys - install(FILES ${YUBIKEY_LICENSE} DESTINATION doc RENAME YubiKey.license) - install(FILES ${YKPERS_LICENSE} DESTINATION doc RENAME YKPers.license) - install(FILES ${YKPERS_RULES} DESTINATION share) + install(FILES ${YUBIKEY_LICENSE} RENAME YubiKey DESTINATION share/openbr/licenses) + install(FILES ${YKPERS_LICENSE} RENAME YKPers DESTINATION share/openbr/licenses) + install(FILES ${YKPERS_RULES} DESTINATION share/openbr) set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} ${YUBIKEY_SRC} ${YKPERS_SRC} plugins/yubico.cpp) set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${YKPERS_LIBS}) -- libgit2 0.21.4