diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-16 13:41:24 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-16 13:41:24 -0800 |
| commit | 325e6e485a88efeee316f633ae3dfeed1be45ceb (patch) | |
| tree | 571e8761bed2d20b8f4214de15dd67639b2b4312 | |
| parent | e681aef8d1f9906515edd649936bca33a2103e73 (diff) | |
| parent | f29a02cc3c8cbb50d0e4f1a5220fef27dce9e9ca (diff) | |
| download | engrampa-325e6e485a88efeee316f633ae3dfeed1be45ceb.tar.bz2 engrampa-325e6e485a88efeee316f633ae3dfeed1be45ceb.tar.xz | |
Merge pull request #37 from infirit/1.6
Cherrypick usefull commits from master
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | data/Makefile.am | 3 | ||||
| -rw-r--r-- | distro/archlinux/PKGBUILD | 49 | ||||
| -rw-r--r-- | distro/archlinux/mate-file-archiver.install | 25 |
5 files changed, 19 insertions, 79 deletions
diff --git a/Makefile.am b/Makefile.am index 3f8a38f..0de02b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,6 @@ ## Process this file with automake to produce Makefile.in. +ACLOCAL_AMFLAGS = -I m4 + if ENABLE_CAJA_ACTIONS CAJA = caja else @@ -38,7 +40,8 @@ DISTCLEANFILES = \ intltool-merge \ intltool-update -DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper +DISTCHECK_CONFIGURE_FLAGS = --with-cajadir='$${libdir}/caja/extensions-2.0-distcheck' + MAINTAINERCLEANFILES = \ $(srcdir)/INSTALL \ diff --git a/configure.ac b/configure.ac index 9f3eb25..4560d48 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,12 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) AC_INIT([engrampa], [1.6.0], [http://www.mate-desktop.org/]) -AM_INIT_AUTOMAKE([1.9 foreign]) +AM_INIT_AUTOMAKE([1.9 foreign dist-xz no-dist-gzip]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) +AC_CONFIG_MACRO_DIR([m4]) MATE_COMMON_INIT @@ -150,8 +151,17 @@ AC_SUBST(DISABLE_DEPRECATED) dnl ****************************** -CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension` -AC_SUBST(CAJA_EXTENSION_DIR) +AC_ARG_WITH(cajadir, + AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]), + [ac_with_cajadir=$withval], + [ac_with_cajadir=""]) +if test "${ac_with_cajadir}" = ""; then + ac_with_cajadir=`pkg-config --variable=extensiondir libcaja-extension` +fi + +AC_MSG_NOTICE([installing caja plugin in ${ac_with_cajadir}]) +AC_SUBST([CAJA_EXTENSION_DIR],[${ac_with_cajadir}]) + dnl ****************************** diff --git a/data/Makefile.am b/data/Makefile.am index 41375d6..2c7fc8e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -53,6 +53,7 @@ CLEANFILES = \ $(gsettings_SCHEMAS) \ $(NULL) -dist-hook: cd $(distdir); rm -f $(CLEANFILES) +dist-hook: + cd $(distdir); rm -f $(CLEANFILES) -include $(top_srcdir)/git.mk diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD deleted file mode 100644 index 6b357c9..0000000 --- a/distro/archlinux/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer: Spyros Stathopoulos <[email protected]> -# Contributor: Alessio Sergi <asergi at archlinux dot us> -pkgname=mate-extract -pkgver=1.1.0 -pkgrel=1 -pkgdesc="Archive manipulator for MATE" -arch=('i686' 'x86_64') -license=('GPL') -depends=('desktop-file-utils' 'mate-conf' 'hicolor-icon-theme') -makedepends=('mate-doc-utils' 'intltool') -conflicts=('engrampa' 'engrampa2') -optdepends=('unrar: for RAR uncompression' -'zip: for ZIP archives' 'unzip: for ZIP archives' -'p7zip: 7zip compression utility' 'arj: for ARJ archives' -'unace: extraction tool for the proprietary ace archive format') -options=('!libtool' '!emptydirs') -install=mate-extract.install -url="http://matsusoft.com.ar/projects" -groups=('mate-extras') -source=(http://sourceforge.net/projects/matede/files/${pkgver}/${pkgname}.tar.gz/download) -md5sums=('4f26837dca3752cc9d17cdbcb16c4ed5') - -build() { - cd "$srcdir/$pkgname" - - mate-doc-prepare --force - autoreconf -i - aclocal - - ./configure --prefix=/usr \ - --disable-static \ - --localstatedir=/var \ - --libexecdir=/usr/lib/${pkgname} \ - --disable-scrollkeeper \ - --disable-schemas-install \ - --sysconfdir=/etc \ - --disable-packagekit - make -} - -package() { - cd "$srcdir/$pkgname" - make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir/" install - install -d -m755 "${pkgdir}/usr/share/mateconf/schemas" - mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} "${pkgdir}/etc/mateconf/schemas/*.schemas" - rm -f "${pkgdir}/etc/mateconf/schemas/*.schemas" -} - -# vim:set ts=2 sw=2 et: diff --git a/distro/archlinux/mate-file-archiver.install b/distro/archlinux/mate-file-archiver.install deleted file mode 100644 index fbbe087..0000000 --- a/distro/archlinux/mate-file-archiver.install +++ /dev/null @@ -1,25 +0,0 @@ -pkgname=engrampa - -post_install() { - usr/sbin/mateconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/mateconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - |