From 1a31a54c9bda135b22f8bc2cf8eeb48beb0ba4ac Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 6 May 2019 20:39:55 +0000 Subject: [PATCH] set paths suitable for installation when building from scripts Signed-off-by: Ivailo Monev --- package/archlinux/PKGBUILD | 6 +++--- scripts/fastdev.sh | 6 +++++- scripts/minsize.sh | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 7d195b45d..b35286a2f 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -14,8 +14,7 @@ depends=('openssl' 'zlib' 'cups' 'libice' 'icu' 'libsm' 'pcre' 'libxcursor' makedepends=('cmake' 'git' 'python' 'postgresql' 'mariadb' 'unixodbc' 'unifdef') optdepends=('postgresql-libs: PostgreSQL driver' 'libmariadbclient: MariaDB driver' - 'unixodbc: ODBC driver' - 'python: Python bindings') + 'unixodbc: ODBC driver') source=("git+https://github.com/fluxer/katie") sha1sums=('SKIP') conflicts=('katie') @@ -36,11 +35,12 @@ build() { -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DKATIE_SETTINGS_FULL=/etc/xdg \ -DKATIE_LDCONF_FULL=/etc/ld.so.conf.d \ -DKATIE_PROFILE_FULL=/etc/profile.d \ -DKATIE_TOOLS_SUFFIX="-katie" \ -DKATIE_ALLINONE=ON \ - -DKATIE_BINDINGS=ON + -DKATIE_BINDINGS=OFF make } diff --git a/scripts/fastdev.sh b/scripts/fastdev.sh index 9e521d40a..cb3ba404a 100755 --- a/scripts/fastdev.sh +++ b/scripts/fastdev.sh @@ -8,5 +8,9 @@ rm -rf "$cwd/../fastdev" mkdir -p "$cwd/../fastdev" cd "$cwd/../fastdev" -cmake ../ -DCMAKE_BUILD_TYPE=FastDev $@ +cmake ../ -DCMAKE_BUILD_TYPE=FastDev \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKATIE_SETTINGS_FULL=/etc/xdg \ + -DKATIE_LDCONF_FULL=/etc/ld.so.conf.d \ + -DKATIE_PROFILE_FULL=/etc/profile.d $@ make -j$(nproc || echo 1) diff --git a/scripts/minsize.sh b/scripts/minsize.sh index 42265c892..e5b33f93a 100755 --- a/scripts/minsize.sh +++ b/scripts/minsize.sh @@ -10,5 +10,9 @@ cd "$cwd/../minsize" export CFLAGS="$CFLAGS -flto" CXXFLAGS="$CXXFLAGS -flto" -cmake ../ -DCMAKE_BUILD_TYPE=MinSizeRel $@ +cmake ../ -DCMAKE_BUILD_TYPE=MinSizeRel \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKATIE_SETTINGS_FULL=/etc/xdg \ + -DKATIE_LDCONF_FULL=/etc/ld.so.conf.d \ + -DKATIE_PROFILE_FULL=/etc/profile.d $@ make -j$(nproc || echo 1) -- 2.11.0