From a84841a0786d19f8889108ab2f068b2e6926d99d Mon Sep 17 00:00:00 2001 From: Doug Newgard Date: Thu, 7 Nov 2013 20:03:40 +0900 Subject: [PATCH] PKGBUILD Cleanup Summary: Change pkgname to variable instead of array Remove optdepend, no more efl_x11 package Remove strip and zipman options, they are default and we shouldn't override them if we don't need to Set CFLAGS correctly and remove -02 and -g, again defaults we shouldn't override unless necessary Only run make clean distclean when there is a Makefile to prevent build failure Quote all paths with $pkgdir Add PKGBUILD to EXTRA_DIST so it gets included in make dist Reviewers: raster Reviewed By: raster Differential Revision: https://phab.enlightenment.org/D284 --- Makefile.am | 2 +- pkgbuild/PKGBUILD.in | 22 ++++++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index e026a3cf..595ee4d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,5 +26,5 @@ m4/ltoptions.m4 \ m4/ltsugar.m4 \ m4/ltversion.m4 -EXTRA_DIST = README AUTHORS COPYING autogen.sh terminology.spec +EXTRA_DIST = README AUTHORS COPYING autogen.sh terminology.spec pkgbuild/PKGBUILD diff --git a/pkgbuild/PKGBUILD.in b/pkgbuild/PKGBUILD.in index 101b944d..72079d09 100644 --- a/pkgbuild/PKGBUILD.in +++ b/pkgbuild/PKGBUILD.in @@ -1,5 +1,5 @@ # Maintainer: Enlightenment Developers -pkgname=('terminology') +pkgname=terminology pkgver=@VERSION@ pkgrel=1 pkgdesc="Terminal emulator for Enlightenment - GIT development snapshot" @@ -7,12 +7,11 @@ arch=('i686' 'x86_64' 'arm') url="http://www.enlightenment.org" license=('BSD') depends=('elementary' 'efl') -optdepends=('efl_x11') -options=('strip' 'zipman' '!libtool' 'debug') -buildflags="-O2 -g -fvisibility=hidden -fomit-frame-pointer" +options=('!libtool' 'debug') build() { cd "../.." - make clean distclean + export CFLAGS="$CFLAGS -fvisibility=hidden -fomit-frame-pointer" + [[ -e Makefile ]] && make clean distclean ./configure --prefix=/usr make } @@ -24,12 +23,11 @@ build() { package() { cd "../.." - rm -rf $pkgdir/usr make -j1 DESTDIR="$pkgdir/" install - install -Dm644 README $pkgdir/usr/share/$pkgname/README - install -Dm644 NEWS $pkgdir/usr/share/$pkgname/NEWS - install -Dm644 ChangeLog $pkgdir/usr/share/$pkgname/ChangeLog - install -Dm644 AUTHORS $pkgdir/usr/share/$pkgname/AUTHORS - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING - ln -s ../licenses/$pkgname/COPYING $pkgdir/usr/share/$pkgname/COPYING + install -Dm644 README "$pkgdir/usr/share/$pkgname/README" + install -Dm644 NEWS "$pkgdir/usr/share/$pkgname/NEWS" + install -Dm644 ChangeLog "$pkgdir/usr/share/$pkgname/ChangeLog" + install -Dm644 AUTHORS "$pkgdir/usr/share/$pkgname/AUTHORS" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + ln -s ../licenses/$pkgname/COPYING "$pkgdir/usr/share/$pkgname/COPYING" }