diff options
| author | infirit <[email protected]> | 2014-12-20 16:58:15 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-08-25 10:42:38 +0200 |
| commit | 174b53faa344ebcad2a42acf8017aa22c49c9a46 (patch) | |
| tree | 09f4d805e19fcdfb3c0d5084622020a768918ddd /icons | |
| parent | 6902afa1be1a3fe2955a3756c2cb8c3d2cf9ea4f (diff) | |
| download | libmateweather-174b53faa344ebcad2a42acf8017aa22c49c9a46.tar.bz2 libmateweather-174b53faa344ebcad2a42acf8017aa22c49c9a46.tar.xz | |
build: cleanup Makefile.am and re-enable some code
Diffstat (limited to 'icons')
| -rw-r--r-- | icons/Makefile.am | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/icons/Makefile.am b/icons/Makefile.am index 39c97ac..c93b934 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -459,27 +459,28 @@ noinst_DATA = \ 32x32_status_weather-few-clouds-night-350.svg \ moonshadow.pl -EXTRA_DIST = \ - $(public_icons) \ - $(noinst_DATA) +gtk_update_icon_cache = gtk-update-icon-cache -f -t +install-data-local: install-icons +uninstall-local: uninstall-icons -gtk_update_icon_cache = gtk-update-icon-cache -f -t +install-data-hook: update-icon-cache +uninstall-hook: update-icon-cache install-icons: -for icon in $(public_icons); do \ ICON=`echo $$icon | sed -e 's:_:/:g'`; \ ICONDIR=`dirname $$ICON`; \ - mkdir -p $(DESTDIR)$(datadir)/$(subdir)/mate/$$ICONDIR; \ - echo INSTALL $(DESTDIR)$(datadir)/$(subdir)/mate/$$ICON; \ - $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/$(subdir)/mate/$$ICON; \ + mkdir -p $(DESTDIR)$(datadir)/icons/mate/$$ICONDIR; \ + echo INSTALL $(DESTDIR)$(datadir)/icons/mate/$$ICON; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/mate/$$ICON; \ done; uninstall-icons: -for icon in $(public_icons); do \ ICON=`echo $$icon | sed -e 's:_:/:g'`; \ - echo rm -f $(DESTDIR)$(datadir)/$(subdir)/mate/$$ICON; \ - rm -f $(DESTDIR)$(datadir)/$(subdir)/mate/$$ICON; \ + echo rm -f $(DESTDIR)$(datadir)/icons/mate/$$ICON; \ + rm -f $(DESTDIR)$(datadir)/icons/mate/$$ICON; \ done update-icon-cache: @@ -488,9 +489,9 @@ update-icon-cache: $(gtk_update_icon_cache) $(DESTDIR)$(datadir)/$(subdir)/mate; \ else \ echo "*** Icon cache not updated. After (un)install, run this:"; \ - echo "*** $(gtk_update_icon_cache) $(DESTDIR)$(datadir)/$(subdir)/mate"; \ + echo "*** $(gtk_update_icon_cache) $(DESTDIR)$(datadir)/icons/mate"; \ fi -install-data-local: install-icons update-icon-cache - -uninstall-local: uninstall-icons update-icon-cache +EXTRA_DIST = \ + $(public_icons) \ + $(noinst_DATA) |