diff options
| -rw-r--r-- | data/Makefile.am | 26 | ||||
| -rw-r--r-- | data/caja-autorun-software.desktop.in.in (renamed from data/caja-autorun-software.desktop.in) | 4 | ||||
| -rw-r--r-- | data/caja-browser.desktop.in.in (renamed from data/caja-browser.desktop.in) | 4 | ||||
| -rw-r--r-- | data/caja-computer.desktop.in.in (renamed from data/caja-computer.desktop.in) | 4 | ||||
| -rw-r--r-- | data/caja-file-management-properties.desktop.in.in (renamed from data/caja-file-management-properties.desktop.in) | 2 | ||||
| -rw-r--r-- | data/caja-folder-handler.desktop.in.in (renamed from data/caja-folder-handler.desktop.in) | 4 | ||||
| -rw-r--r-- | data/caja-home.desktop.in.in (renamed from data/caja-home.desktop.in) | 4 | ||||
| -rw-r--r-- | data/caja.desktop.in.in (renamed from data/caja.desktop.in) | 2 | ||||
| -rw-r--r-- | data/mate-network-scheme.desktop.in.in (renamed from src/mate-network-scheme.desktop.in) | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 16 | ||||
| -rw-r--r-- | src/Makefile.am | 12 |
11 files changed, 38 insertions, 44 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 20202cf2..314241a9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -7,17 +7,21 @@ xml_files = $(xml_in_files:.xml.in=.xml) $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ desktopdir = $(datadir)/applications -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -desktop_in_files = \ - caja.desktop.in \ - caja-home.desktop.in \ - caja-computer.desktop.in \ - caja-folder-handler.desktop.in \ - caja-file-management-properties.desktop.in \ - caja-browser.desktop.in \ - caja-autorun-software.desktop.in -%.desktop: %.desktop.in +desktop_DATA = \ + caja.desktop \ + caja-home.desktop \ + caja-computer.desktop \ + caja-folder-handler.desktop \ + caja-file-management-properties.desktop \ + caja-browser.desktop \ + caja-autorun-software.desktop \ + mate-network-scheme.desktop +desktop_in_files = $(desktop_DATA:.desktop=.desktop.in) +desktop_in_in_files = $(desktop_DATA:.desktop=.desktop.in.in) +%.desktop.in: %.desktop.in.in $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ +%.desktop: %.desktop.in + $(AM_V_GEN) sed -e 's|@bindir[@]|$(bindir)|g' $< > $@ mimedir = $(datadir)/mime/packages mime_DATA = $(xml_files) @@ -60,12 +64,14 @@ EXTRA_DIST = $(cajadata_DATA) \ $(xml_in_files) \ $(cajadata_in_files) \ $(desktop_in_files) \ + $(desktop_in_in_files) \ $(service_in_files) \ $(appdata_in_files) \ $(NULL) CLEANFILES = $(xml_files) \ $(desktop_DATA) \ + $(desktop_in_files) \ $(service_DATA) \ caja.appdata.xml \ $(NULL) diff --git a/data/caja-autorun-software.desktop.in b/data/caja-autorun-software.desktop.in.in index 0db85788..aa116f11 100644 --- a/data/caja-autorun-software.desktop.in +++ b/data/caja-autorun-software.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] Name=Autorun Prompt -TryExec=caja-autorun-software -Exec=caja-autorun-software %u +TryExec=@bindir@/caja-autorun-software +Exec=@bindir@/caja-autorun-software %u Icon=application-x-executable NoDisplay=true Terminal=false diff --git a/data/caja-browser.desktop.in b/data/caja-browser.desktop.in.in index a9a40eb0..45800040 100644 --- a/data/caja-browser.desktop.in +++ b/data/caja-browser.desktop.in.in @@ -2,8 +2,8 @@ Name=Caja GenericName=File Browser Comment=Browse the file system with the file manager -TryExec=caja -Exec=caja --no-desktop --browser %U +TryExec=@bindir@/caja +Exec=@bindir@/caja --no-desktop --browser %U Icon=system-file-manager Terminal=false StartupNotify=false diff --git a/data/caja-computer.desktop.in b/data/caja-computer.desktop.in.in index 25c1ba24..7d638aa0 100644 --- a/data/caja-computer.desktop.in +++ b/data/caja-computer.desktop.in.in @@ -1,8 +1,8 @@ [Desktop Entry] Name=Computer Comment=Browse all local and remote disks and folders accessible from this computer -TryExec=caja -Exec=caja --no-desktop computer: +TryExec=@bindir@/caja +Exec=@bindir@/caja --no-desktop computer: Icon=computer Terminal=false StartupNotify=true diff --git a/data/caja-file-management-properties.desktop.in b/data/caja-file-management-properties.desktop.in.in index 14ee8f24..2851a7c9 100644 --- a/data/caja-file-management-properties.desktop.in +++ b/data/caja-file-management-properties.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] Name=File Management Comment=Change the behaviour and appearance of file manager windows -Exec=caja-file-management-properties +Exec=@bindir@/caja-file-management-properties Icon=system-file-manager Terminal=false Type=Application diff --git a/data/caja-folder-handler.desktop.in b/data/caja-folder-handler.desktop.in.in index b536bf89..017e0fdc 100644 --- a/data/caja-folder-handler.desktop.in +++ b/data/caja-folder-handler.desktop.in.in @@ -1,8 +1,8 @@ [Desktop Entry] Name=Caja GenericName=Open Folder -TryExec=caja -Exec=caja --no-desktop %U +TryExec=@bindir@/caja +Exec=@bindir@/caja --no-desktop %U NoDisplay=true Terminal=false Icon=folder-open diff --git a/data/caja-home.desktop.in b/data/caja-home.desktop.in.in index 3aad993f..d0d1d5ba 100644 --- a/data/caja-home.desktop.in +++ b/data/caja-home.desktop.in.in @@ -1,8 +1,8 @@ [Desktop Entry] Name=Home Folder Comment=Open your personal folder -TryExec=caja -Exec=caja --no-desktop +TryExec=@bindir@/caja +Exec=@bindir@/caja --no-desktop Icon=user-home Terminal=false StartupNotify=true diff --git a/data/caja.desktop.in b/data/caja.desktop.in.in index ce4f8340..5f109692 100644 --- a/data/caja.desktop.in +++ b/data/caja.desktop.in.in @@ -1,7 +1,7 @@ [Desktop Entry] Name=Caja GenericName=File Manager -Exec=caja +Exec=@bindir@/caja Icon=system-file-manager Terminal=false Type=Application diff --git a/src/mate-network-scheme.desktop.in b/data/mate-network-scheme.desktop.in.in index d3449fa5..ca7f0a2c 100644 --- a/src/mate-network-scheme.desktop.in +++ b/data/mate-network-scheme.desktop.in.in @@ -1,8 +1,8 @@ [Desktop Entry] Name=Network Comment=Browse bookmarked and local network locations -TryExec=caja -Exec=caja --no-desktop network: +TryExec=@bindir@/caja +Exec=@bindir@/caja --no-desktop network: Terminal=false StartupNotify=true Type=Application diff --git a/po/POTFILES.in b/po/POTFILES.in index c77d550e..f97157e8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,14 +2,15 @@ # Please keep this file sorted alphabetically. data/browser.xml.in data/caja.appdata.xml.in -data/caja-autorun-software.desktop.in -data/caja-browser.desktop.in -data/caja-computer.desktop.in -data/caja.desktop.in -data/caja-file-management-properties.desktop.in -data/caja-folder-handler.desktop.in -data/caja-home.desktop.in +data/caja-autorun-software.desktop.in.in +data/caja-browser.desktop.in.in +data/caja-computer.desktop.in.in +data/caja.desktop.in.in +data/caja-file-management-properties.desktop.in.in +data/caja-folder-handler.desktop.in.in +data/caja-home.desktop.in.in data/caja.xml.in +data/mate-network-scheme.desktop.in.in eel/eel-canvas.c eel/eel-editable-label.c eel/eel-glib-extensions.c @@ -112,4 +113,3 @@ src/caja-window-toolbars.c src/caja-window.c src/caja-x-content-bar.c src/caja-zoom-control.c -src/mate-network-scheme.desktop.in diff --git a/src/Makefile.am b/src/Makefile.am index 5641e922..8ce75565 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,16 +51,6 @@ $(dbus_freedesktop_built_sources) : Makefile.am $(top_srcdir)/data/freedesktop-d $(top_srcdir)/data/freedesktop-dbus-interfaces.xml \ $(NULL) -desktop_in_files=mate-network-scheme.desktop.in -desktop_files=$(desktop_in_files:.desktop.in=.desktop) -desktopdir = $(datadir)/mate/network/ - -$(desktop_files): $(desktop_in_files) - $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ - -schemedir = $(datadir)/applications -scheme_DATA = mate-network-scheme.desktop - BUILT_SOURCES = \ caja-src-marshal.c \ caja-src-marshal.h \ @@ -220,7 +210,6 @@ ui_DATA = \ CLEANFILES = \ caja-src-marshal.list \ $(BUILT_SOURCES) \ - $(desktop_files) \ $(server_DATA) \ $(NULL) @@ -230,7 +219,6 @@ EXTRA_DIST = \ $(ui_DATA) \ check-caja \ $(about_DATA) \ - $(desktop_in_files) \ $(NULL) dist-hook: |