[rkward-cvs] SF.net SVN: rkward: [2260] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 2260
          http://rkward.svn.sourceforge.net/rkward/?rev=2260&view=rev
Author:   tfry
Date:     2007-11-20 07:33:56 -0800 (Tue, 20 Nov 2007)

Log Message:
-----------
correct installation of rkward.desktop file

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/Makefile.am

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2007-11-20 13:18:25 UTC (rev 2259)
+++ trunk/rkward/ChangeLog	2007-11-20 15:33:56 UTC (rev 2260)
@@ -1,3 +1,6 @@
+--- Version 0.4.9 - Xxx-XX-XXXX
+
+- Fixed: correct installation of rkward.desktop file
 - Use the KDE default fixed spacing font for command log and object viewer
 
 --- Version 0.4.8a - Nov-11-2007

Modified: trunk/rkward/rkward/Makefile.am
===================================================================
--- trunk/rkward/rkward/Makefile.am	2007-11-20 13:18:25 UTC (rev 2259)
+++ trunk/rkward/rkward/Makefile.am	2007-11-20 15:33:56 UTC (rev 2260)
@@ -41,15 +41,12 @@
 	misc core icons windows syntax pages
 
 install-data-local:
-	$(mkinstalldirs) $(kde_appsdir)/Applications/
-	$(INSTALL_DATA) $(srcdir)/rkward.desktop $(kde_appsdir)/Applications/rkward.desktop
 	$(mkinstalldirs) $(kde_icondir)/locolor/32x32/apps/
 	$(INSTALL_DATA) $(srcdir)/lo32-app-rkward.png $(kde_icondir)/locolor/32x32/apps/rkward.png
 	$(mkinstalldirs) $(kde_icondir)/locolor/16x16/apps/
 	$(INSTALL_DATA) $(srcdir)/lo16-app-rkward.png $(kde_icondir)/locolor/16x16/apps/rkward.png
 
 uninstall-local:
-	-rm -f $(kde_appsdir)/Applications/rkward.desktop
 	-rm -f $(kde_icondir)/locolor/32x32/apps/rkward.png
 	-rm -f $(kde_icondir)/locolor/16x16/apps/rkward.png
 
@@ -64,6 +61,8 @@
 rcdir = $(kde_datadir)/rkward
 rc_DATA = rkwardui.rc rkconsolepart.rc
 
+xdg_apps_DATA = rkward.desktop
+
 bin_SCRIPTS = rkward
 
 # all the perl script does is fill in the placeholder for R_HOMEDIR and friends


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.