diff --git a/CMakeLists.txt b/CMakeLists.txt index 76641fe..1511a1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,10 +27,10 @@ endif() # instal scripts and other things install(PROGRAMS cgproxyd TYPE BIN) install(PROGRAMS cgnoproxy TYPE BIN) -install(PROGRAMS cgroup-tproxy.sh DESTINATION /usr/share/cgproxy/scripts/) -install(FILES cgproxy.service DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/) -install(FILES config.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cgproxy/) -install(FILES readme.md DESTINATION ${CMAKE_INSTALL_DOCDIR}/cgproxy/) +install(PROGRAMS cgroup-tproxy.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/cgproxy/scripts) +install(FILES cgproxy.service DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system) +install(FILES config.json DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/cgproxy) +install(FILES readme.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) # man pages set(man_gz ${PROJECT_SOURCE_DIR}/man/cgproxyd.1.gz ${PROJECT_SOURCE_DIR}/man/cgproxy.1.gz ${PROJECT_SOURCE_DIR}/man/cgnoproxy.1.gz) diff --git a/pack/CMakeLists.txt b/pack/CMakeLists.txt index f74e721..b59297a 100644 --- a/pack/CMakeLists.txt +++ b/pack/CMakeLists.txt @@ -5,7 +5,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "cgproxy will transparent proxy anything r ## deb pack set(CPACK_DEBIAN_PACKAGE_NAME "cgproxy") -set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "x86_64") +set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") set(CPACK_DEBIAN_PACKAGE_DEPENDS "systemd") set(CPACK_DEBIAN_PACKAGE_SECTION "network") set(CPACK_DEBIAN_PACKAGE_PRIORITY "Optional") diff --git a/readme.md b/readme.md index be4ced8..66d21e5 100644 --- a/readme.md +++ b/readme.md @@ -55,12 +55,14 @@ Main feature: ## How to install ```bash -mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ .. && make install +# +mkdir build && cd build +# cmake +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. && make install ``` - It is alreay in [archlinux AUR](https://aur.archlinux.org/packages/?K=cgproxy). -- DEB and RPM are packaged in [release page](https://github.com/springzfx/cgproxy/releases). ## Default usage