diff options
| author | Russ Allbery <rra@stanford.edu> | 2010-05-02 17:51:52 -0700 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2010-05-02 17:51:52 -0700 |
| commit | 40f23e6445961c356d266e15d63b08eaac277946 (patch) | |
| tree | ae3388231ba64d066e1b9beec2a3d6f975e2834c /ruby | |
| parent | df9c10713c53d98211102b3127a2a3d8bdb0d345 (diff) | |
Don't override libdir in the Ruby extconf.rb
If libdir is set to something else in extconf.rb, that changes the install
location when using the distribution paths, which complicates Debian
packaging. Instead, set LDFLAGS in a different way to prefer our
directories.
Diffstat (limited to 'ruby')
| -rw-r--r-- | ruby/extconf.rb.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ruby/extconf.rb.in b/ruby/extconf.rb.in index 18eafad..6868d0a 100644 --- a/ruby/extconf.rb.in +++ b/ruby/extconf.rb.in @@ -10,9 +10,7 @@ # This hack is to force the extension to build against the local client # library rather than some other library already installed on the system. require 'rbconfig' -old_libdir = Config::CONFIG['libdir'] require 'mkmf' -Config::MAKEFILE_CONFIG['libdir'] = '@abs_top_srcdir@/client/.libs' # We add $CFLAGS to the contents of $CPPFLAGS since otherwise we lose the # Ruby $CFLAGS. The build system overrides CFLAGS with make warnings. @@ -20,8 +18,7 @@ Config::MAKEFILE_CONFIG['libdir'] = '@abs_top_srcdir@/client/.libs' # should be able to set at build time without losing information. $INCFLAGS = "-I@abs_top_srcdir@ #{$INCFLAGS}" $CPPFLAGS << " #{$CFLAGS} @CPPFLAGS@" -$LDFLAGS << " -L@abs_top_srcdir@/client/.libs -lremctl -L#{old_libdir}" -$LDFLAGS << " @LDFLAGS@" +$LDFLAGS = "-L@abs_top_srcdir@/client/.libs -lremctl @LDFLAGS@ #{$LDFLAGS}" # Intentionally do not check for libremctl here. We're forcing the link # with LDFLAGS above, and mkmf is apparently too stupid to use $LDFLAGS |