aboutsummaryrefslogtreecommitdiff
path: root/ruby
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <Marc-Antoine@Perennou.com> 2012-01-20 15:53:50 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2012-02-19 13:17:40 +0000
commit5484572bbf04e0008f3f9200dd9f082fb7d7c1ad (patch)
treeccb24ff653b3e18422e117d8cdd93dd2f39b2198 /ruby
parent9777bd7a2393017baf0c3fdf41cfe0d13d9cc66c (diff)
downloadpaludis-5484572bbf04e0008f3f9200dd9f082fb7d7c1ad.tar.gz
paludis-5484572bbf04e0008f3f9200dd9f082fb7d7c1ad.tar.xz
ruby: Fix build with ruby 1.9
And btw, refactor a little 1.8 autotools chain Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Diffstat (limited to 'ruby')
-rw-r--r--ruby/Makefile.am10
1 files changed, 5 insertions, 5 deletions
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index eae6ac15a..5e8e79d04 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -76,12 +76,12 @@ if ENABLE_RUBY
lib_LTLIBRARIES = libpaludisruby_@PALUDIS_PC_SLOT@.la
-libpaludisruby_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) -I. -I@RUBY_HDRDIR@ -I@RUBY_HDRARCHDIR@
+libpaludisruby_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) -I. $(RUBY_CFLAGS)
libpaludisruby_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
paludis_ruby_so.o : paludis_ruby_so.cc
if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) \
- $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) -I$(RUBY_HDRDIR) -I$(RUBY_HDRARCHDIR) -c \
+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) $(RUBY_CFLAGS) -c \
-o $@ $(srcdir)/paludis_ruby_so.cc ; then ln -fs .libs/paludis_ruby_so.o $@ ; else rm -f $@ ; exit 1 ; fi
libpaludisruby_@PALUDIS_PC_SLOT@_la_SOURCES = $(IF_RUBY_SOURCES)
@@ -93,7 +93,7 @@ libpaludisruby_@PALUDIS_PC_SLOT@_la_LIBADD = \
$(PTHREAD_LIBS)
check_DATA = .libs/Paludis.so
-rubylibdir = @RUBY_INSTALL_DIR@
+rubylibdir = $(RUBY_INSTALL_DIR)
rubylib_DATA = Paludis.so
.libs/Paludis.so : libpaludisruby_@PALUDIS_PC_SLOT@.la paludis_ruby_so.o
@@ -101,7 +101,7 @@ rubylib_DATA = Paludis.so
$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) $(PTHREAD_LIBS) \
- -l@RUBY_SONAME@ \
+ $(RUBY_LIBS) \
-o $@ \
.libs/paludis_ruby_so.o \
-L$(top_builddir)/ruby/.libs -lpaludisruby_@PALUDIS_PC_SLOT@
@@ -110,7 +110,7 @@ Paludis.so : libpaludisruby_@PALUDIS_PC_SLOT@.la paludis_ruby_so.o
$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) $(PTHREAD_LIBS) \
- -l@RUBY_SONAME@ \
+ $(RUBY_LIBS) \
-o $@ \
.libs/paludis_ruby_so.o \
-L$(top_builddir)/ruby/.libs -lpaludisruby_@PALUDIS_PC_SLOT@