Gentoo Archives: gentoo-commits

From: "Markos Chandras (hwoarang)" <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/fltk/files: fltk-1.1.9-share.patch
Date: Sun, 30 May 2010 10:44:27
Message-Id: 20100530104421.3456C2CAD8@corvid.gentoo.org
1 hwoarang 10/05/30 10:44:21
2
3 Added: fltk-1.1.9-share.patch
4 Log:
5 Apply dadadir fix from bug #315531.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 x11-libs/fltk/files/fltk-1.1.9-share.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/fltk/files/fltk-1.1.9-share.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/fltk/files/fltk-1.1.9-share.patch?rev=1.1&content-type=text/plain
13
14 Index: fltk-1.1.9-share.patch
15 ===================================================================
16 --- fluid/Makefile.orig 2010-03-29 22:41:01.828043805 -0500
17 +++ fluid/Makefile 2010-03-29 22:43:57.973828814 -0500
18 @@ -84,16 +84,16 @@
19 $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
20
21 install-linux:
22 - -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications
23 - $(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applications
24 + -$(INSTALL_DIR) $(DESTDIR)$(datadir)/applications
25 + $(INSTALL_DATA) fluid.desktop $(DESTDIR)$(datadir)/applications
26 for size in 16 32 48 64 128; do \
27 - if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \
28 - $(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \
29 + if test ! -d $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; then \
30 + $(INSTALL_DIR) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \
31 fi; \
32 - $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
33 + $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
34 done
35 - -$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application
36 - $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application
37 + -$(INSTALL_DIR) $(DESTDIR)$(datadir)/mimelnk/application
38 + $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)$(datadir)/mimelnk/application
39
40 install-osx:
41 echo Installing Fluid in $(DESTDIR)/Applications...
42 @@ -111,9 +111,9 @@
43 $(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
44
45 uninstall-linux:
46 - $(RM) $(DESTDIR)/usr/share/applications/fluid.desktop
47 - $(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png
48 - $(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop
49 + $(RM) $(DESTDIR)$(datadir)/applications/fluid.desktop
50 + $(RM) $(DESTDIR)$(datadir)/icons/hicolor/*/fluid.png
51 + $(RM) $(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop
52
53 uninstall-osx:
54 $(RM) -r $(DESTDIR)/Applications/fluid.app