1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
--- config/Make.rules.orig 2008-05-21 13:39:46.000000000 -0400
+++ config/Make.rules 2008-05-21 13:43:35.000000000 -0400
@@ -11,13 +11,13 @@
# Select an installation base directory. The directory will be created
# if it does not exist.
#
-prefix ?= /opt/Ice-$(VERSION)
+prefix ?= /$(DESTDIR)/usr
#
# The "root directory" for runpath embedded in executables. Can be unset
# to avoid adding a runpath to Ice executables.
#
-embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
+#embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
#
# Define OPTIMIZE as yes if you want to build with
@@ -144,10 +144,10 @@
include $(top_srcdir)/config/Make.rules.$(UNAME)
install_includedir := $(prefix)/include
-install_docdir := $(prefix)/doc
+install_docdir := $(prefix)/share/doc/Ice-$(VERSION)
install_bindir := $(prefix)/$(binsubdir)
install_libdir := $(prefix)/$(libsubdir)
-install_configdir := $(prefix)/config
+install_configdir := $(prefix)/share/Ice/config
ifneq ($(embedded_runpath_prefix),)
runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir)
@@ -162,18 +162,8 @@
BZIP2_LIBS = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2
BZIP2_RPATH_LINK = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir)))
-ifneq ($(DB_HOME),)
- DB_FLAGS = -I$(DB_HOME)/include
- DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx
- DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir))
-else
- ifeq ($(shell if [ -d /usr/include/db46 -a -d /usr/$(libsubdir)/db46 ] ; then echo yes; fi), yes)
- DB_FLAGS = -I/usr/include/db46
- DB_LIBS = -L/usr/$(libsubdir)/db46 -ldb_cxx
- else
- DB_LIBS = -ldb_cxx
- endif
-endif
+DB_FLAGS = -I/usr/include/db4.6
+DB_LIBS = -L/usr/$(libsubdir) -ldb_cxx-4.6
EXPAT_FLAGS = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include)
EXPAT_LIBS = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat
--- Makefile.orig 2008-05-21 13:42:32.000000000 -0400
+++ Makefile 2008-05-21 13:42:50.000000000 -0400
@@ -11,11 +11,11 @@
include $(top_srcdir)/config/Make.rules
-SUBDIRS = config src include test demo
+SUBDIRS = config src include
INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
-install:: install-common
+install::
@for subdir in $(INSTALL_SUBDIRS); \
do \
if test ! -d $$subdir ; \
|
GitWeb
