diff options
| author | Stefano Karapetsas <[email protected]> | 2013-07-18 15:05:15 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-07-18 15:05:15 -0700 |
| commit | c599a345825236d8e0c89c6c43a66d778422153d (patch) | |
| tree | 2a7d6049b7f2e2299be487ea5eddb4e311e364bd /data | |
| parent | 93a2ed0d29cd905560eb0a285d18c8096d79e931 (diff) | |
| parent | 5c97d988bca602cb73efc7f3ae62a7fb51baff05 (diff) | |
| download | caja-c599a345825236d8e0c89c6c43a66d778422153d.tar.bz2 caja-c599a345825236d8e0c89c6c43a66d778422153d.tar.xz | |
Merge pull request #141 from NiceandGently/master
fix privat icons dir and make files for automake-1.13
Diffstat (limited to 'data')
| -rw-r--r-- | data/icons/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 82931541..87345eb4 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -61,8 +61,8 @@ install-icons: CONTEXT=`echo $$icon | cut -d_ -f2`; \ SIZE=`echo $$icon | cut -d_ -f3`; \ ICONFILE=`echo $$icon | cut -d_ -f4`; \ - mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ - $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done uninstall-icons: @@ -78,7 +78,7 @@ uninstall-icons: CONTEXT=`echo $$icon | cut -d_ -f2`; \ SIZE=`echo $$icon | cut -d_ -f3`; \ ICONFILE=`echo $$icon | cut -d_ -f4`; \ - rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done install-data-local: install-icons update-icon-cache |