ruby: simplify build

We can just always add EXTRA_INCFLAGS and EXTRA_LDFLAGS.

diff --git a/bindings/Makefile.local b/bindings/Makefile.local
index 9875123ab106cc6a94f5d62ba4e29ea60f24e742..eb9326139bec89e7cc85bca8cc3f23c8895cbab3 100644 (file)
--- a/bindings/Makefile.local
+++ b/bindings/Makefile.local
@@ -9,8 +9,8 @@ $(dir)/ruby.stamp: lib/$(LINKER_NAME)
 ifeq ($(HAVE_RUBY_DEV),1)
        cd $(dir)/ruby && \
                EXTRA_LDFLAGS="$(NO_UNDEFINED_LDFLAGS)" \
+               EXTRA_INCFLAGS="-I$(NOTMUCH_SRCDIR)/lib" \
                LIBNOTMUCH="../../lib/$(LINKER_NAME)" \
-               NOTMUCH_SRCDIR='$(NOTMUCH_SRCDIR)' \
                $(RUBY) extconf.rb --vendor
        $(MAKE) -C $(dir)/ruby CFLAGS="$(CFLAGS) -pipe -fno-plt -fPIC" && touch $@
 endif

diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb
index d914537cff1bbb502e8dd85c1f9e764eed2d1b55..7cec711f9ed22ab9d80b68c88f224df9bfe9de74 100644 (file)
--- a/bindings/ruby/extconf.rb
+++ b/bindings/ruby/extconf.rb
@@ -5,14 +5,8 @@
 
 require 'mkmf'
 
-dir = File.join(ENV['NOTMUCH_SRCDIR'], 'lib')
-
-# includes
-$INCFLAGS = "-I#{dir} #{$INCFLAGS}"
-
-if ENV['EXTRA_LDFLAGS']
-  $LDFLAGS += " " + ENV['EXTRA_LDFLAGS']
-end
+$INCFLAGS = "#{ENV['EXTRA_INCFLAGS']} #{$INCFLAGS}"
+$LDFLAGS = "#{ENV['EXTRA_LDFLAGS']} #{$LDFLAGS}"
 
 if not ENV['LIBNOTMUCH']
   exit 1