Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/opencascade/files: opencascade-6.8.0-fixed-DESTDIR.patch
Date: Fri, 27 Feb 2015 14:37:40
Message-Id: 20150227143733.D9B2D12AB8@oystercatcher.gentoo.org
1 xmw 15/02/27 14:37:33
2
3 Added: opencascade-6.8.0-fixed-DESTDIR.patch
4 Log:
5 Version bump (bug 533408, thanks SÅ‚awek Lis and tamiko).
6
7 (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
8
9 Revision Changes Path
10 1.1 sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/opencascade/files/opencascade-6.8.0-fixed-DESTDIR.patch?rev=1.1&content-type=text/plain
14
15 Index: opencascade-6.8.0-fixed-DESTDIR.patch
16 ===================================================================
17 --- opencascade-6.8.0/Makefile.am
18 +++ opencascade-6.8.0/Makefile.am
19 @@ -82,27 +82,27 @@
20 cd $(top_builddir)/adm/lin/amk && $(MAKE) $(AM_MAKEFLAGS) Draw
21
22 install-exec-local:
23 - $(INSTALL) -d $(prefix)/$(platform)
24 - if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \
25 - cd $(prefix)/$(platform) && ln -s ../bin bin; \
26 + $(INSTALL) -d $(DESTDIR)$(prefix)/$(platform)
27 + if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(platform)/bin ]; then \
28 + cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../bin bin; \
29 fi
30 - if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \
31 - cd $(prefix)/$(platform) && ln -s ../lib lib; \
32 + if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(platform)/lib ]; then \
33 + cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../lib lib; \
34 fi
35 - buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(prefix); installd=`pwd`; cd $$buildd; \
36 + buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(DESTDIR)$(prefix); installd=`pwd`; cd $$buildd; \
37 if [ "$$installd" != "$$sourced" ]; then \
38 - $(INSTALL) -d $(prefix)/inc; \
39 - cp -frL $(top_srcdir)/inc $(prefix); \
40 - cp -frL $$buildd/config.h $(prefix); \
41 + $(INSTALL) -d $(DESTDIR)$(prefix)/inc; \
42 + cp -frL $(top_srcdir)/inc $(DESTDIR)$(prefix); \
43 + cp -frL $$buildd/config.h $(DESTDIR)$(prefix); \
44 for d in $(FoundationClasses_DIRS) $(ModelingData_DIRS) $(ModelingAlgorithms_DIRS) $(Visualization_DIRS) $(ApplicationFramework_DIRS) $(DataExchange_DIRS) $(Draw_DIRS); do \
45 - $(INSTALL) -d $(prefix)/src/$$d; \
46 - cp -frL $(top_srcdir)/src/$$d $(prefix)/src; \
47 + $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \
48 + cp -frL $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \
49 done; \
50 fi
51 - if [ -e $(prefix)/inc/config.h ]; then \
52 - rm -f $(prefix)/inc/config.h; \
53 + if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \
54 + rm -f $(DESTDIR)$(prefix)/inc/config.h; \
55 fi
56 - cd $(prefix)/inc && ln -s ../config.h config.h
57 - cd $(top_srcdir) && cp *.sh $(prefix)
58 + cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h
59 + cd $(top_srcdir) && cp *.sh $(DESTDIR)$(prefix)
60
61 -.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw
62 \ No newline at end of file
63 +.PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw