1 |
caleb 09/03/28 23:35:27 |
2 |
|
3 |
Added: Ice-3.3.1-Makefile.patch |
4 |
Log: |
5 |
Version bump, bump to EAPI=2 for use dep |
6 |
(Portage version: 2.1.6.9/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-cpp/Ice/files/Ice-3.3.1-Makefile.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/Ice/files/Ice-3.3.1-Makefile.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/Ice/files/Ice-3.3.1-Makefile.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: Ice-3.3.1-Makefile.patch |
15 |
=================================================================== |
16 |
--- config/Make.rules.orig 2008-05-21 13:39:46.000000000 -0400 |
17 |
+++ config/Make.rules 2008-05-21 13:43:35.000000000 -0400 |
18 |
@@ -11,13 +11,13 @@ |
19 |
# Select an installation base directory. The directory will be created |
20 |
# if it does not exist. |
21 |
# |
22 |
-prefix ?= /opt/Ice-$(VERSION) |
23 |
+prefix ?= /$(DESTDIR)/usr |
24 |
|
25 |
# |
26 |
# The "root directory" for runpath embedded in executables. Can be unset |
27 |
# to avoid adding a runpath to Ice executables. |
28 |
# |
29 |
-embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) |
30 |
+#embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) |
31 |
|
32 |
# |
33 |
# Define OPTIMIZE as yes if you want to build with |
34 |
@@ -144,10 +144,10 @@ |
35 |
include $(top_srcdir)/config/Make.rules.$(UNAME) |
36 |
|
37 |
install_includedir := $(prefix)/include |
38 |
-install_docdir := $(prefix)/doc |
39 |
+install_docdir := $(prefix)/share/doc/Ice-$(VERSION) |
40 |
install_bindir := $(prefix)/$(binsubdir) |
41 |
install_libdir := $(prefix)/$(libsubdir) |
42 |
-install_configdir := $(prefix)/config |
43 |
+install_configdir := $(prefix)/share/Ice/config |
44 |
|
45 |
ifneq ($(embedded_runpath_prefix),) |
46 |
runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir) |
47 |
@@ -162,18 +162,8 @@ |
48 |
BZIP2_LIBS = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2 |
49 |
BZIP2_RPATH_LINK = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir))) |
50 |
|
51 |
-ifneq ($(DB_HOME),) |
52 |
- DB_FLAGS = -I$(DB_HOME)/include |
53 |
- DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx |
54 |
- DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)) |
55 |
-else |
56 |
- ifeq ($(shell if [ -d /usr/include/db46 -a -d /usr/$(libsubdir)/db46 ] ; then echo yes; fi), yes) |
57 |
- DB_FLAGS = -I/usr/include/db46 |
58 |
- DB_LIBS = -L/usr/$(libsubdir)/db46 -ldb_cxx |
59 |
- else |
60 |
- DB_LIBS = -ldb_cxx |
61 |
- endif |
62 |
-endif |
63 |
+DB_FLAGS = -I/usr/include/db4.6 |
64 |
+DB_LIBS = -L/usr/$(libsubdir) -ldb_cxx-4.6 |
65 |
|
66 |
EXPAT_FLAGS = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include) |
67 |
EXPAT_LIBS = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat |
68 |
--- Makefile.orig 2008-05-21 13:42:32.000000000 -0400 |
69 |
+++ Makefile 2008-05-21 13:42:50.000000000 -0400 |
70 |
@@ -11,11 +11,11 @@ |
71 |
|
72 |
include $(top_srcdir)/config/Make.rules |
73 |
|
74 |
-SUBDIRS = config src include test demo |
75 |
+SUBDIRS = config src include |
76 |
|
77 |
INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir) |
78 |
|
79 |
-install:: install-common |
80 |
+install:: |
81 |
@for subdir in $(INSTALL_SUBDIRS); \ |
82 |
do \ |
83 |
if test ! -d $$subdir ; \ |