aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmake/VendorConfig.cmake4
-rw-r--r--linux/.config2
-rw-r--r--linux/makepkg/PKGBUILD6
3 files changed, 7 insertions, 5 deletions
diff --git a/cmake/VendorConfig.cmake b/cmake/VendorConfig.cmake
index 42e72c8..1e12b33 100644
--- a/cmake/VendorConfig.cmake
+++ b/cmake/VendorConfig.cmake
@@ -24,7 +24,9 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${CONFIG_CXX_FLAGS} ${CONF
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${CONFIG_CXX_FLAGS} ${CONFIG_CXX_FLAGS_RELEASE}")
# Install paths
-set(CMAKE_INSTALL_PREFIX ${CONFIG_INSTALL_PREFIX})
+if(NOT CONFIG_INSTALL_PREFIX STREQUAL "")
+ set(CMAKE_INSTALL_PREFIX ${CONFIG_INSTALL_PREFIX})
+endif()
## Version information, used in src/version.h.in
if (EXISTS "${PROJECT_SOURCE_DIR}/.git")
diff --git a/linux/.config b/linux/.config
index eb0fb92..8a84cad 100644
--- a/linux/.config
+++ b/linux/.config
@@ -17,7 +17,7 @@ CONFIG_CXX_FLAGS_RELEASE=""
#
# Install paths
#
-CONFIG_INSTALL_PREFIX="/usr/local"
+CONFIG_INSTALL_PREFIX=""
CONFIG_INSTALL_BIN="bin"
CONFIG_INSTALL_LIB="lib/smolbote"
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index 240f711..c327b47 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -55,14 +55,14 @@ build() {
# generate makefile
# see doc/Building.asciidoc for list of options
cmake -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$pkgdir/usr/local \
+ -DCMAKE_INSTALL_PREFIX=/usr/local \
-Dpoi_Version="$_tag" \
-Dpoi_Describe="$pkgver" \
-Dpoi_Build="$_branch:$_commit" \
$srcdir/smolbote
# if you want to manually customize the build, you can use ccmake here
- ccmake .
+ #ccmake .
# Build
make
@@ -70,7 +70,7 @@ build() {
package() {
# Install
- make install
+ DESTDIR="$pkgdir" make install
msg2 "Installing icon and .desktop"
install -Dm644 $srcdir/smolbote/data/poi.svg $pkgdir/usr/share/icons/hicolor/scalable/apps/poi.svg