summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2006-01-15 03:25:44 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2006-01-15 03:25:44 +0000
commit45ff3267cd1e963bd5b87994cb9bb60f19ac6c56 (patch)
tree24cdf799293fbd726adaedc8c7ea6606cfa11e52
parent887a45822703da2420df9c2ecc024b1f4dfc218e (diff)
Fix installation of Linux desktop files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4751 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--fltk.list.in10
-rw-r--r--fluid/Makefile4
-rw-r--r--fluid/fluid.desktop3
3 files changed, 9 insertions, 8 deletions
diff --git a/fltk.list.in b/fltk.list.in
index badf0cc27..74755aab3 100644
--- a/fltk.list.in
+++ b/fltk.list.in
@@ -130,11 +130,11 @@ f 0444 root sys /Applications/fluid.app/Contents/Resources/fluid.icns fluid/icon
%system linux
f 0444 root sys /usr/share/applnk/Development/fluid.desktop fluid/fluid.desktop
-f 0444 root sys /usr/share/icons/hicolor/16x16/fluid.png fluid/icons/fluid-16.png
-f 0444 root sys /usr/share/icons/hicolor/32x32/fluid.png fluid/icons/fluid-32.png
-f 0444 root sys /usr/share/icons/hicolor/48x48/fluid.png fluid/icons/fluid-48.png
-f 0444 root sys /usr/share/icons/hicolor/64x64/fluid.png fluid/icons/fluid-64.png
-f 0444 root sys /usr/share/icons/hicolor/128x128/fluid.png fluid/icons/fluid-128.png
+f 0444 root sys /usr/share/icons/hicolor/16x16/apps/fluid.png fluid/icons/fluid-16.png
+f 0444 root sys /usr/share/icons/hicolor/32x32/apps/fluid.png fluid/icons/fluid-32.png
+f 0444 root sys /usr/share/icons/hicolor/48x48/apps/fluid.png fluid/icons/fluid-48.png
+f 0444 root sys /usr/share/icons/hicolor/64x64/apps/fluid.png fluid/icons/fluid-64.png
+f 0444 root sys /usr/share/icons/hicolor/128x128/apps/fluid.png fluid/icons/fluid-128.png
f 0444 root sys /usr/share/mimelnk/application/x-fluid.desktop fluid/x-fluid.desktop
%system all
diff --git a/fluid/Makefile b/fluid/Makefile
index ec17b98cd..70604b4da 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -88,8 +88,8 @@ install-linux:
-$(MKDIR) $(DESTDIR)/usr/share/applnk/Development
$(CP) fluid.desktop $(DESTDIR)/usr/share/applnk/Development
for size in 16 32 48 64 128; do \
- -$(MKDIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}; \
- $(CP) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/fluid.png; \
+ -$(MKDIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \
+ $(CP) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
done
-$(MKDIR) $(DESTDIR)/usr/share/mimelnk/application
$(CP) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application
diff --git a/fluid/fluid.desktop b/fluid/fluid.desktop
index c95c89343..f4135dae3 100644
--- a/fluid/fluid.desktop
+++ b/fluid/fluid.desktop
@@ -2,9 +2,10 @@
Name=fluid
Comment=FLTK GUI Designer
TryExec=fluid
-Exec=fluid
+Exec=fluid %F
Icon=fluid
Terminal=false
Type=Application
+MimeType=application/x-fluid
Encoding=UTF-8
Categories=Development