Commit 92755d35c47b0595f10f7a40c90648f977cd3a62
1 parent
2a7d9900
changed license installation convention
Showing
5 changed files
with
7 additions
and
7 deletions
openbr/openbr_export.cpp
| ... | ... | @@ -58,7 +58,7 @@ |
| 58 | 58 | $ cd bin |
| 59 | 59 | $ export LD_LIBRARY_PATH=../lib:${LD_LIBRARY_PATH} |
| 60 | 60 | $ sudo ldconfig |
| 61 | -$ sudo cp ../share/70-yubikey.rules /etc/udev/rules.d # Only needed if you were given a license dongle. | |
| 61 | +$ sudo cp ../share/openbr/70-yubikey.rules /etc/udev/rules.d # Only needed if you were given a license dongle. | |
| 62 | 62 | \endverbatim |
| 63 | 63 | * \par OS X |
| 64 | 64 | \verbatim | ... | ... |
openbr/plugins/eigen3.cmake
| ... | ... | @@ -3,5 +3,5 @@ set(BR_WITH_EIGEN3 ON CACHE BOOL "Build Eigen3 plugins") |
| 3 | 3 | if(${BR_WITH_EIGEN3}) |
| 4 | 4 | find_package(Eigen3 REQUIRED) |
| 5 | 5 | set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/eigen3.cpp) |
| 6 | - install(FILES ${EIGEN3_LICENSE} RENAME Eigen3.license DESTINATION .) | |
| 6 | + install(FILES ${EIGEN3_LICENSE} RENAME Eigen3 DESTINATION share/openbr/licenses) | |
| 7 | 7 | endif() | ... | ... |
openbr/plugins/mongoose.cmake
| ... | ... | @@ -2,5 +2,5 @@ set(BR_WITH_MONGOOSE OFF CACHE BOOL "Build with Mongoose") |
| 2 | 2 | if(${BR_WITH_MONGOOSE}) |
| 3 | 3 | find_package(Mongoose) |
| 4 | 4 | set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/mongoose.cpp ${MONGOOSE_SRC}) |
| 5 | - install(FILES ${MONGOOSE_LICENSE} RENAME mongoose.license DESTINATION .) | |
| 5 | + install(FILES ${MONGOOSE_LICENSE} RENAME mongoose DESTINATION share/openbr/licenses) | |
| 6 | 6 | endif() | ... | ... |
openbr/plugins/qtnetwork.cmake
| ... | ... | @@ -4,5 +4,5 @@ if(${BR_WITH_QTNETWORK}) |
| 4 | 4 | find_package(HttpParser) |
| 5 | 5 | set(QT_DEPENDENCIES ${QT_DEPENDENCIES} Network) |
| 6 | 6 | set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} plugins/qtnetwork.cpp ${HTTPPARSER_SRC}) |
| 7 | - install(FILES ${HTTPPARSER_LICENSE} RENAME http-parser.license DESTINATION .) | |
| 7 | + install(FILES ${HTTPPARSER_LICENSE} RENAME http-parser DESTINATION share/openbr/license) | |
| 8 | 8 | endif() | ... | ... |
openbr/plugins/yubico.cmake
| ... | ... | @@ -4,9 +4,9 @@ if(${BR_WITH_YUBICO}) |
| 4 | 4 | find_package(YubiKey REQUIRED) # For decrypting YubiKeys |
| 5 | 5 | find_package(YKPers REQUIRED) # For reading YubiKeys |
| 6 | 6 | |
| 7 | - install(FILES ${YUBIKEY_LICENSE} DESTINATION doc RENAME YubiKey.license) | |
| 8 | - install(FILES ${YKPERS_LICENSE} DESTINATION doc RENAME YKPers.license) | |
| 9 | - install(FILES ${YKPERS_RULES} DESTINATION share) | |
| 7 | + install(FILES ${YUBIKEY_LICENSE} RENAME YubiKey DESTINATION share/openbr/licenses) | |
| 8 | + install(FILES ${YKPERS_LICENSE} RENAME YKPers DESTINATION share/openbr/licenses) | |
| 9 | + install(FILES ${YKPERS_RULES} DESTINATION share/openbr) | |
| 10 | 10 | |
| 11 | 11 | set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} ${YUBIKEY_SRC} ${YKPERS_SRC} plugins/yubico.cpp) |
| 12 | 12 | set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${YKPERS_LIBS}) | ... | ... |