0002-Install-libraries-and-pkg-config-data-into-multiarch.patch

Antonio Terceiro, 02/18/2013 07:28 AM

Download (1.4 KB)

View differences:

configure.in
3185 3185
	      AS_HELP_STRING([--enable-multiarch], [enable multiarch compatible directories]),
3186 3186
	      [multiarch=], [unset multiarch])
3187 3187

  
3188
ENABLE_MULTIARCH=${multiarch+'yes'}${multiarch-'no'}
3189
AC_SUBST(ENABLE_MULTIARCH)
3190

  
3188 3191
AC_ARG_WITH(multiarchname,
3189 3192
	      AS_HELP_STRING([--with-multiarchname], [sets architecture name for multiarch]))
3190 3193

  
tool/rbinstall.rb
304 304
goruby_install_name = "go" + ruby_install_name
305 305

  
306 306
bindir = CONFIG["bindir", true]
307
libdir = CONFIG["libdir", true]
307
libdir = CONFIG["ENABLE_MULTIARCH"] == "yes" && CONFIG["archlibdir"] || CONFIG["libdir", true]
308 308
rubyhdrdir = CONFIG["rubyhdrdir", true]
309 309
archhdrdir = CONFIG["rubyarchhdrdir"] || (rubyhdrdir + "/" + CONFIG['arch'])
310 310
rubylibdir = CONFIG["rubylibdir", true]
311
-