Use absolute path in Desktop file's Exec entry

This allows to run the right binary whether it is in the DE's PATH or
not.

Makefile.am

@@ -15,7 +15,7 @@ WIN32_BUILD_FILES = \
 EXTRA_DIST = \
 	autogen.sh \
 	scripts/gen-api-gtkdoc.py \
-	geany.desktop.in \
+	geany.desktop.in.in \
 	geany.pc.in \
 	ChangeLog.pre-1-22 \
 	HACKING \
@@ -26,6 +26,9 @@ EXTRA_DIST = \
 	intltool-update.in \
 	$(WIN32_BUILD_FILES)
 
+CLEANFILES = \
+	geany.desktop.in
+
 DISTCLEANFILES = \
 	geany.desktop \
 	intltool-extract \
@@ -78,7 +81,12 @@ rpm: dist
 pkgconfig_DATA = geany.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
+.desktop.in.in.desktop.in:
+	$(AM_V_GEN) $(SED) -e "s|@bindir[@]|$(bindir)|" $< > $@ || rm $@
+
 desktopdir = $(datadir)/applications
 desktop_in_files = geany.desktop
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
+
+SUFFIXES = .desktop.in .desktop.in.in

geany.desktop.in → geany.desktop.in.in

@@ -4,7 +4,7 @@ Version=1.0
 _Name=Geany
 _GenericName=Integrated Development Environment
 _Comment=A fast and lightweight IDE using GTK+
-Exec=geany %F
+Exec=@bindir@/geany %F
 Icon=geany
 Terminal=false
 Categories=GTK;Development;IDE;TextEditor;

po/POTFILES.in

@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 
-geany.desktop.in
+geany.desktop.in.in
 data/geany.glade
 src/about.c
 src/build.c