From b3b7f64832b266744a658ef5fd9a4d01c370d4ff Mon Sep 17 00:00:00 2001 From: mid-kid Date: Mon, 11 Sep 2017 18:31:40 +0200 Subject: [PATCH] Add dir_localstate --- astronaut/astronaut | 1 + satellites/functions/compile/cmake.sh | 8 +++++--- satellites/functions/compile/configure.sh | 1 + satellites/functions/compile/meson.sh | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/astronaut/astronaut b/astronaut/astronaut index 98f025b..0af3e50 100755 --- a/astronaut/astronaut +++ b/astronaut/astronaut @@ -20,6 +20,7 @@ dir_bin='bin' dir_sbin='sbin' dir_libexec='libexec' dir_sysconf='etc' +dir_localstate='var' dir_lib='lib' dir_include='include' dir_data='share' diff --git a/satellites/functions/compile/cmake.sh b/satellites/functions/compile/cmake.sh index 3a7318b..f1d2e6f 100644 --- a/satellites/functions/compile/cmake.sh +++ b/satellites/functions/compile/cmake.sh @@ -22,21 +22,23 @@ compile_cmake() { 'Ninja') local make="ninja $NINJAFLAGS" ;; esac + # https://github.com/Kitware/CMake/blob/master/Modules/GNUInstallDirs.cmake mkdir -p "$builddir"; cd "$builddir" cmake "$olddir" -G "$generator" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="/$dir_prefix" \ - -DCMAKE_INSTALL_FULL_SYSCONFDIR="/$dir_prefix/$dir_sysconf" \ -DCMAKE_INSTALL_FULL_BINDIR="/$dir_prefix/$dir_bin" \ -DCMAKE_INSTALL_FULL_SBINDIR="/$dir_prefix/$dir_sbin" \ -DCMAKE_INSTALL_FULL_LIBEXECDIR="/$dir_prefix/$dir_libexec" \ + -DCMAKE_INSTALL_FULL_SYSCONFDIR="/$dir_prefix/$dir_sysconf" \ + -DCMAKE_INSTALL_FULL_LOCALSTATEDIR="/$dir_prefix/$dir_localstate" \ -DCMAKE_INSTALL_FULL_LIBDIR="/$dir_prefix/$dir_lib" \ -DCMAKE_INSTALL_FULL_INCLUDEDIR="/$dir_prefix/$dir_include" \ -DCMAKE_INSTALL_FULL_DATADIR="/$dir_prefix/$dir_data" \ - -DCMAKE_INSTALL_FULL_MANDIR="/$dir_prefix/$dir_man" \ - -DCMAKE_INSTALL_FULL_DOCDIR="/$dir_prefix/$dir_doc/$name" \ -DCMAKE_INSTALL_FULL_INFODIR="/$dir_prefix/$dir_info" \ -DCMAKE_INSTALL_FULL_LOCALEDIR="/$dir_prefix/$dir_locale" \ + -DCMAKE_INSTALL_FULL_MANDIR="/$dir_prefix/$dir_man" \ + -DCMAKE_INSTALL_FULL_DOCDIR="/$dir_prefix/$dir_doc/$name" \ "$@" $make diff --git a/satellites/functions/compile/configure.sh b/satellites/functions/compile/configure.sh index 0a65a50..c1ca72f 100644 --- a/satellites/functions/compile/configure.sh +++ b/satellites/functions/compile/configure.sh @@ -35,6 +35,7 @@ compile_configure() { --sbindir="/$dir_prefix/$dir_sbin" \ --libexecdir="/$dir_prefix/$dir_libexec" \ --sysconfdir="/$dir_prefix/$dir_sysconf" \ + --localstatedir="/$dir_prefix/$dir_localstate" \ --libdir="/$dir_prefix/$dir_lib" \ --includedir="/$dir_prefix/$dir_include" \ --datadir="/$dir_prefix/$dir_data" \ diff --git a/satellites/functions/compile/meson.sh b/satellites/functions/compile/meson.sh index 7e9a9e0..d812423 100644 --- a/satellites/functions/compile/meson.sh +++ b/satellites/functions/compile/meson.sh @@ -26,6 +26,7 @@ compile_meson() { --infodir="/$dir_prefix/$dir_info" \ --localedir="/$dir_prefix/$dir_locale" \ --sysconfdir="/$dir_prefix/$dir_sysconf" \ + --localstatedir="/$dir_prefix/$dir_localstate" \ "$@" ninja $NINJAFLAGS