Minor PKGBUILD cleanup

Summary:
Add PKGBUILD to make dist so it will be in the snapshots
Change dep to current efl package since efl_x11 isn't there anymore
Check for Makefile before running make clean distclean otherwise build fails
Set correct arch on elementary_doc
Install docs to /usr/share/doc

Reviewers: raster

Differential Revision: https://phab.enlightenment.org/D282

diff --git a/Makefile.am b/Makefile.am
index c7b7b23..e69009e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,7 +69,8 @@ elementary.spec.in \
 m4/ac_attribute.m4 \
 m4/efl_binary.m4 \
 m4/efl_doxygen.m4 \
-config.rpath
+config.rpath \
+pkgbuild/PKGBUILD
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = elementary.pc

diff --git a/pkgbuild/PKGBUILD.in b/pkgbuild/PKGBUILD.in
index 7618231..6f1927c 100644 (file)
--- a/pkgbuild/PKGBUILD.in
+++ b/pkgbuild/PKGBUILD.in
@@ -7,13 +7,13 @@ arch=('i686' 'x86_64' 'arm')
 url="http://www.enlightenment.org"
 license=('LGPL2.1' 'CCPL:cc-by-sa')
 makedepends=('doxygen' 'imagemagick')
-depends=('efl_x11' 'evas_generic_loaders')
+depends=('efl' 'evas_generic_loaders')
 optdepends=('emotion_generic_players')
 options=('!libtool' 'debug')
 build() {
   cd "../.."
   export CFLAGS="$CFLAGS -fvisibility=hidden -fomit-frame-pointer"
-  make clean distclean
+  [[ -e Makefile ]] && make clean distclean
   ./configure --prefix=/usr \
   --disable-static
   make
@@ -37,9 +37,8 @@ package_elementary() {
   sed -n '1,/details./p' COPYING > "$pkgdir/usr/share/licenses/$pkgname/COPYING"
   ln -s "../licenses/$pkgname/COPYING" "$pkgdir/usr/share/$pkgname/COPYING"
   ln -s "../licenses/$pkgname/COPYING.images" "$pkgdir/usr/share/$pkgname/COPYING.images"
-  rm -rf "$pkgdir/usr/bin/"elementary_test*
+  rm -rf "$pkgdir/usr/bin/"elementary_test
   rm -rf "$pkgdir/usr/lib/elementary/modules/"{test_entry,test_map}
-  rm -rf "$pkgdir/usr/lib/elementary_testql.so"
   rm -rf "$pkgdir/usr/share/applications/elementary_test.desktop"
   rm -rf "$pkgdir/usr/share/elementary/"{examples,images,objects}
 }
@@ -52,7 +51,8 @@ package_elementary_test() {
   make -j1 DESTDIR="$pkgdir/" install
   rm -rf "$pkgdir/usr/include"
   rm -rf "$pkgdir/usr/bin/"{elementary_codegen,elementary_config,elementary_quicklaunch,elementary_run,elm_prefs_cc}
-  rm -rf "$pkgdir/usr/lib/"{cmake,edje,elementary,libelementary.so*,pkgconfig}
+  rm -rf "$pkgdir/usr/lib/"{cmake,edje,libelementary.so*,pkgconfig}
+  rm -rf "$pkgdir/usr/lib/elementary/modules/"{access_output,datetime_input_ctxpopup,prefs}
   rm -rf "$pkgdir/usr/share/applications/elementary_config.desktop"
   rm -rf "$pkgdir/usr/share/elementary/"{config,examples,themes,edje_externals}
   rm -rf "$pkgdir/usr/share/"{icons,locale}
@@ -60,10 +60,11 @@ package_elementary_test() {
 
 package_elementary_doc() {
   pkgdesc="Documentation for Elementary"
-  depends=()
+  arch=('any')
+  unset depends optdepends
 
   cd "../.."
-  mkdir -p "$pkgdir/usr/share/$pkgname"
-  cp -a doc/html "$pkgdir/usr/share/$pkgname/html"
-  cp -a doc/latex "$pkgdir/usr/share/$pkgname/latex"
+  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
+  cp -a doc/html "$pkgdir/usr/share/doc/$pkgname/html"
+  cp -a doc/latex "$pkgdir/usr/share/doc/$pkgname/latex"
 }