summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--configure.ac7
-rw-r--r--icons/Makefile.am14
3 files changed, 13 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index b15496b..022fb42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,7 +70,7 @@ after_success:
env:
- - DISTRO="archlinux:latest"
+# - DISTRO="archlinux:latest"
- DISTRO="debian:testing"
- DISTRO="fedora:latest"
- DISTRO="ubuntu:rolling"
diff --git a/configure.ac b/configure.ac
index 6be9814..b1bd4cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ dnl gettext
AM_GNU_GETTEXT_VERSION([0.19.8])
AM_GNU_GETTEXT([external])
-GETTEXT_PACKAGE=libmateweather
+GETTEXT_PACKAGE=AC_PACKAGE_NAME
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
@@ -190,7 +190,10 @@ dnl ***************************************************************************
dnl *** Display Summary ***
dnl ***************************************************************************
echo "
-libmateweather-$VERSION configure summary:
+Configure summary:
+
+ ${PACKAGE_STRING}
+ `echo $PACKAGE_STRING | sed "s/./=/g"`
Prefix: ${prefix}
Source code location: ${srcdir}
diff --git a/icons/Makefile.am b/icons/Makefile.am
index af2679c..731faf9 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -471,25 +471,25 @@ install-icons:
-for icon in $(public_icons); do \
ICON=`echo $$icon | sed -e 's:_:/:g'`; \
ICONDIR=`dirname $$ICON`; \
- mkdir -p $(DESTDIR)$(datadir)/icons/mate/$$ICONDIR; \
- echo INSTALL $(DESTDIR)$(datadir)/icons/mate/$$ICON; \
- $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/mate/$$ICON; \
+ mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/$$ICONDIR; \
+ echo INSTALL $(DESTDIR)$(datadir)/icons/hicolor/$$ICON; \
+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/hicolor/$$ICON; \
done;
uninstall-icons:
-for icon in $(public_icons); do \
ICON=`echo $$icon | sed -e 's:_:/:g'`; \
- echo rm -f $(DESTDIR)$(datadir)/icons/mate/$$ICON; \
- rm -f $(DESTDIR)$(datadir)/icons/mate/$$ICON; \
+ echo rm -f $(DESTDIR)$(datadir)/icons/hicolor/$$ICON; \
+ rm -f $(DESTDIR)$(datadir)/icons/hicolor/$$ICON; \
done
update-icon-cache:
@-if test -z "$(DESTDIR)" && test -n $(ICON_UPDATE); then \
echo "Updating Gtk icon cache."; \
- $(gtk_update_icon_cache) $(DESTDIR)$(datadir)/$(subdir)/mate; \
+ $(gtk_update_icon_cache) $(DESTDIR)$(datadir)/icons/hicolor; \
else \
echo "*** Icon cache not updated. After (un)install, run this:"; \
- echo "*** $(gtk_update_icon_cache) $(DESTDIR)$(datadir)/icons/mate"; \
+ echo "*** $(gtk_update_icon_cache) $(DESTDIR)$(datadir)/icons/hicolor"; \
fi
EXTRA_DIST = \