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
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
--- ruby/Makefile.orig 2007-03-13 08:31:21.000000000 -0400
+++ ruby/Makefile 2007-03-13 08:31:50.000000000 -0400
@@ -128,8 +128,8 @@
@echo "Installing generated code"
@for i in $(MODULES) ; \
do \
- $(INSTALL_DATA) $${i}.rb $(install_rubydir) ; \
- $(INSTALL_DATA) -r $$i $(install_rubydir) ; \
+ $(INSTALL_DATA) $${i}.rb $(install_rubylibdir) ; \
+ $(INSTALL_DATA) -r $$i $(install_rubylibdir) ; \
done
clean::
--- src/IceRuby/Makefile.orig 2007-03-13 08:31:58.000000000 -0400
+++ src/IceRuby/Makefile 2007-03-13 08:35:59.000000000 -0400
@@ -48,6 +48,6 @@
ln -s $(SONAME) $@
install:: all
- $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
+ $(call installlib,$(install_rubyarchdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
include .depend
--- config/Make.rules.orig 2008-04-02 13:13:25.000000000 -0400
+++ config/Make.rules 2008-04-02 13:15:14.000000000 -0400
@@ -12,13 +12,13 @@
# 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 optimization.
@@ -45,8 +45,10 @@
RUBY = ruby
endif
-RUBY_INCLUDE_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(archdir)")')
-RUBY_LIB_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(libdir)")')
+RUBY_ARCH_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(archdir)")')
+RUBY_LIB_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(rubylibdir)")')
+RUBY_SITEARCH_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(sitearchdir)")')
+RUBY_SITELIB_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(sitelibdir)")')
RUBY_SHARED = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::MAKEFILE_CONFIG["ENABLE_SHARED"]')
@@ -56,7 +58,7 @@
RUBY_LIB = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("-l$$(RUBY_SO_NAME)-static")')
endif
-RUBY_FLAGS = -I$(RUBY_INCLUDE_DIR)
+RUBY_FLAGS = -I$(RUBY_ARCH_DIR)
RUBY_LIBS = -L$(RUBY_LIB_DIR) $(RUBY_LIB)
# ----------------------------------------------------------------------
@@ -77,8 +79,8 @@
endif
libdir = $(top_srcdir)/ruby
-install_rubydir = $(prefix)/ruby
-install_libdir = $(prefix)/ruby
+install_rubylibdir = $(DESTDIR)/$(RUBY_SITELIB_DIR)
+install_rubyarchdir = $(DESTDIR)/$(RUBY_SITELIB_DIR)
#
# Platform specific definitions
--- Makefile.orig 2008-04-23 09:17:07.000000000 -0400
+++ Makefile 2008-04-23 09:17:27.000000000 -0400
@@ -13,11 +13,11 @@
SUBDIRS = src ruby
-install:: install-common
- @if test ! -d $(install_rubydir) ; \
+install::
+ @if test ! -d $(install_rubylibdir) ; \
then \
- echo "Creating $(install_rubydir)..." ; \
- $(call mkdir,$(install_rubydir)) ; \
+ echo "Creating $(install_rubylibdir)..." ; \
+ mkdir -p $(install_rubylibdir) ; \
fi
$(EVERYTHING)::
|
GitWeb