summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am2
-rw-r--r--data/caja.desktop.in.in2
-rw-r--r--data/icons/Makefile.am6
3 files changed, 6 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index bee031c1..000d45bb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -41,10 +41,12 @@ EXTRA_DIST = $(cajadata_DATA) \
freedesktop-dbus-interfaces.xml \
$(xml_in_files) \
$(desktop_in_files) \
+ $(service_in_files) \
$(NULL)
CLEANFILES = $(xml_files) \
$(desktop_DATA) \
+ $(service_DATA) \
$(NULL)
SUBDIRS = \
diff --git a/data/caja.desktop.in.in b/data/caja.desktop.in.in
index 8e19a811..c9751982 100644
--- a/data/caja.desktop.in.in
+++ b/data/caja.desktop.in.in
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Caja
_GenericName=File Manager
-Exec=caja
+Exec=caja -n
Icon=system-file-manager
Terminal=false
Type=Application
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