diff options
| author | Lenard Spencer <lenardrspencer@gmail.com> | 2021-05-10 19:49:57 +0200 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-05-17 08:49:44 +0700 |
| commit | ca31a2e3136f3ce7d055b3a1b652d5feb26340fe (patch) | |
| tree | 4024d22f00d285c274d8f3eb5fd2e524eec3ccb1 | |
| parent | 724d410c9e48a5cd98f6539523d2e8d9415a7dd9 (diff) | |
office/gnucash: Cleanups.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | office/gnucash/README | 7 | ||||
| -rw-r--r-- | office/gnucash/gnucash.SlackBuild | 26 |
2 files changed, 3 insertions, 30 deletions
diff --git a/office/gnucash/README b/office/gnucash/README index 4961760c5a59d..50543f2800476 100644 --- a/office/gnucash/README +++ b/office/gnucash/README @@ -16,10 +16,3 @@ Pass WITHPYTHON="yes" to enable Python bindings for report gereration. If you want the SQL database integration, you must first have libdbi and libdbi-drivers installed and pass DBI="yes" to the build script. - -The script now incudes an option to build with ninja. To use this -option, make sure ninja is installed and pass NINJA="yes" to the -build script. - -NOTE: You must remove any previous installation of Gnucash before -running this script, otherwise the build will most likely fail. diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild index ac0d94e04ff12..1196dcf8983ad 100644 --- a/office/gnucash/gnucash.SlackBuild +++ b/office/gnucash/gnucash.SlackBuild @@ -62,13 +62,6 @@ else LIBDIRSUFFIX="" fi -# First, make sure a previous Gnucash installation is removed: -if [ -e /usr/bin/gnucash ]; then - echo "A previous Gnucash installation has been found." - echo "Please remove it before running this script." - exit 1 -fi - if [ "$DBI" = "yes" ]; then DBIARGS="-DWITH_SQL=ON -DGNC_DBD_DIR=/usr/lib${LIBDIRSUFFIX}/dbd/" echo " building with SQL integration enabled" @@ -116,14 +109,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# New option to build with ninja: -if [ "${NINJA:-no}" = "yes" ]; then - echo "building using Ninja:" - NINJABUILD="-GNinja" -else - NINJABUILD="" -fi - mkdir -p build cd build cmake \ @@ -137,16 +122,11 @@ cd build $W_PYTHON \ $OFXBANKING \ $AQBANKING \ - $NINJABUILD \ + -GNinja \ -DGNUCASH_BUILD_ID="$VERSION-`date -I` by $PACKAGER" \ -DCMAKE_BUILD_TYPE=release .. -if [ $NINJA = "yes" ]; then - DESTDIR="$PKG" ninja install -else - make - make -j1 install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION -fi +DESTDIR="$PKG" ninja install find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -155,7 +135,7 @@ mv $PKG/usr/share/man/ $PKG/usr/ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -# Don't clobber these +# Don't clobber this mv $PKG/etc/gnucash/environment $PKG/etc/gnucash/environment.new mkdir -p $PKG/usr/doc |