changeset 119:9be643e92fa4

GTK: Create the desktop file during configure so it has the correct paths.
author Brian Smith <brian@dbsoft.org>
date Wed, 17 Jun 2020 12:12:45 -0500
parents 4be7ec1391fb
children f83fd89c0450
files src/configure src/configure.in src/gtk/org.dbsoft.handyftp.desktop src/gtk/org.dbsoft.handyftp.desktop.in
diffstat 4 files changed, 16 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/configure	Fri May 15 06:55:21 2020 -0500
+++ b/src/configure	Wed Jun 17 12:12:45 2020 -0500
@@ -4270,7 +4270,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile:Makefile.in"
+ac_config_files="$ac_config_files Makefile gtk/org.dbsoft.handyftp.desktop"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4963,7 +4963,8 @@
 do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.in" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "gtk/org.dbsoft.handyftp.desktop") CONFIG_FILES="$CONFIG_FILES gtk/org.dbsoft.handyftp.desktop" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
--- a/src/configure.in	Fri May 15 06:55:21 2020 -0500
+++ b/src/configure.in	Wed Jun 17 12:12:45 2020 -0500
@@ -108,4 +108,7 @@
 
 AC_SUBST(ARCH)
 
-AC_OUTPUT(Makefile:Makefile.in)
+AC_CONFIG_FILES([
+Makefile
+gtk/org.dbsoft.handyftp.desktop ])
+AC_OUTPUT
--- a/src/gtk/org.dbsoft.handyftp.desktop	Fri May 15 06:55:21 2020 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
-[Desktop Entry]
-Name=HandyFTP
-Exec=/usr/local/bin/handyftp 
-Icon=/usr/share/pixmaps/handyftp.png
-Terminal=false
-MultipleArgs=false
-Type=Application
-Categories=Application;Network;X-Red-Hat-Base;
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gtk/org.dbsoft.handyftp.desktop.in	Wed Jun 17 12:12:45 2020 -0500
@@ -0,0 +1,9 @@
+
+[Desktop Entry]
+Name=HandyFTP
+Exec=@prefix@/bin/handyftp 
+Icon=@prefix@/share/pixmaps/handyftp.png
+Terminal=false
+MultipleArgs=false
+Type=Application
+Categories=Application;Network;X-Red-Hat-Base;