Generate the usbguard-applet-qt.desktop file at configure time

ZoltanFridrich · Feb 26, 2016 · 1bd31de · 1bd31de
1 parent 3ef41c2
commit 1bd31de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -340,7 +340,7 @@ if GUI_QT5_ENABLED
 bin_PROGRAMS+= usbguard-applet-qt
 
 desktopdir = $(datadir)/applications
-desktop_DATA = src/GUI.Qt5/usbguard-applet-qt.desktop
+desktop_DATA = $(top_builddir)/src/GUI.Qt5/usbguard-applet-qt.desktop
 
 appicondir = $(datadir)/icons/hicolor/scalable/apps
 appicon_DATA = src/GUI.Qt5/resources/usbguard-icon.svg
@@ -363,7 +363,7 @@ BUILT_SOURCES+=\
 EXTRA_DIST+=\
 	src/GUI.Qt5/DeviceDialog.ui \
 	src/GUI.Qt5/MainWindow.ui \
-	src/GUI.Qt5/usbguard-applet-qt.desktop \
+	src/GUI.Qt5/usbguard-applet-qt.desktop.in \
 	$(usbguard_applet_qt_RESOURCES)
 
 CLEANFILES +=\

diff --git a/configure.ac b/configure.ac
@@ -339,7 +339,10 @@ AM_CONDITIONAL([GUI_QT5_ENABLED], [test "x$with_gui_qt5" = xyes ])
 AM_CONDITIONAL([DBUS_ENABLED], [test "x$with_dbus" = xyes ])
 AM_CONDITIONAL([POLICYKIT_ENABLED], [test "x$with_polkit" = xyes])
 
-AC_CONFIG_FILES([Makefile libusbguard.pc src/Tests/Makefile])
+AC_CONFIG_FILES([Makefile
+                 src/Tests/Makefile
+                 libusbguard.pc
+                 src/GUI.Qt5/usbguard-applet-qt.desktop])
 AC_OUTPUT
 
 echo

diff --git a/src/GUI.Qt5/usbguard-applet-qt.desktop → src/GUI.Qt5/usbguard-applet-qt.desktop.in b/src/GUI.Qt5/usbguard-applet-qt.desktop → src/GUI.Qt5/usbguard-applet-qt.desktop.in
@@ -7,4 +7,4 @@ TryExec=usbguard-applet-qt
 Exec=usbguard-applet-qt
 Icon=usbguard-icon
 Categories=System;
-X-Desktop-File-Install-Version=0.3
+X-Desktop-File-Install-Version=@VERSION@