Gentoo Archives: gentoo-commits

From: "William Hubbs (williamh)" <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-accessibility/flite/files: flite-1.4-respect-destdir.patch
Date: Thu, 31 Dec 2009 21:31:42
Message-Id: E1NQScO-0006Q9-Ea@stork.gentoo.org
1 williamh 09/12/31 21:31:40
2
3 Added: flite-1.4-respect-destdir.patch
4 Log:
5 version bump for #299032, thanks to Chris Bruner.
6 (Portage version: 2.2_rc61/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 app-accessibility/flite/files/flite-1.4-respect-destdir.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/flite/files/flite-1.4-respect-destdir.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-accessibility/flite/files/flite-1.4-respect-destdir.patch?rev=1.1&content-type=text/plain
13
14 Index: flite-1.4-respect-destdir.patch
15 ===================================================================
16 From a0ae616d84e9f051ae8536574a9d1289e5f0c060 Mon Sep 17 00:00:00 2001
17 From: William Hubbs <w.d.hubbs@×××××.com>
18 Date: Thu, 31 Dec 2009 12:57:18 -0600
19 Subject: [PATCH] respect destdir
20
21 ---
22 Makefile | 10 +++++-----
23 main/Makefile | 10 +++++-----
24 2 files changed, 10 insertions(+), 10 deletions(-)
25
26 diff --git a/Makefile b/Makefile
27 index 2d3ff09..26b2386 100644
28 --- a/Makefile
29 +++ b/Makefile
30 @@ -106,11 +106,11 @@ tags:
31
32 install:
33 @echo Installing
34 - mkdir -p $(INSTALLBINDIR)
35 - mkdir -p $(INSTALLLIBDIR)
36 - mkdir -p $(INSTALLINCDIR)
37 - $(INSTALL) -m 644 include/*.h $(INSTALLINCDIR)
38 - @ $(MAKE) -C main --no-print-directory install
39 + mkdir -p $(DESTDIR)$(INSTALLBINDIR)
40 + mkdir -p $(DESTDIR)$(INSTALLLIBDIR)
41 + mkdir -p $(DESTDIR)$(INSTALLINCDIR)
42 + $(INSTALL) -m 644 include/*.h $(DESTDIR)$(INSTALLINCDIR)
43 + @ $(MAKE) -C main --no-print-directory DESTDIR=$(DESTDIR) install
44
45 time-stamp :
46 @ echo $(PROJECT_NAME) >.time-stamp
47 diff --git a/main/Makefile b/main/Makefile
48 index 8163e40..0513e59 100644
49 --- a/main/Makefile
50 +++ b/main/Makefile
51 @@ -111,15 +111,15 @@ $(BINDIR)/flite_${VOICE}: flite_main.o $(flite_LIBS_deps)
52
53 install:
54 # The basic binaries
55 - @ $(INSTALL) -m 755 $(BINDIR)/flite $(INSTALLBINDIR)
56 + @ $(INSTALL) -m 755 $(BINDIR)/flite $(DESTDIR)$(INSTALLBINDIR)
57 @ for i in $(VOICES) ; \
58 do \
59 - $(INSTALL) $(BINDIR)/flite_$$i $(INSTALLBINDIR); \
60 + $(INSTALL) $(BINDIR)/flite_$$i $(DESTDIR)$(INSTALLBINDIR); \
61 done
62 - $(INSTALL) -m 755 $(BINDIR)/flite_time $(INSTALLBINDIR)
63 + $(INSTALL) -m 755 $(BINDIR)/flite_time $(DESTDIR)$(INSTALLBINDIR)
64 # The libraries: static and shared (if built)
65 - cp -pd $(flite_LIBS_deps) $(INSTALLLIBDIR)
66 + cp -pd $(flite_LIBS_deps) $(DESTDIR)$(INSTALLLIBDIR)
67 ifdef SHFLAGS
68 - cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(INSTALLLIBDIR)
69 + cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(DESTDIR)$(INSTALLLIBDIR)
70 endif
71
72 --
73 1.6.4.4