Attachment #1457 for bug #9401

View | Details | Raw Unified | Return to bug 9401
Collapse All | Expand All




  program_prefix=
fi
AC_CANONICAL_TARGET
target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`

dnl checks for fat-binary
AC_ARG_ENABLE(fat-binary,

    RUBY_LIB_PREFIX="/lib/ruby"
    ;;
  *)
    RUBY_LIB_PREFIX="${datadir}/ruby"
    RUBY_LIB_PREFIX2="${libdir}/ruby"
    ;;
esac
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
RUBY_LIB_PATH2="${RUBY_LIB_PREFIX2}/${MAJOR}.${MINOR}"

AC_ARG_WITH(sitedir,
	    [  --with-sitedir=DIR      site libraries in DIR [DATADIR/ruby/site_ruby]],
            [sitedir=$withval],
            [sitedir="${datadir}/ruby/site_ruby"])
AC_ARG_WITH(sitearchdir,
	    [  --with-sitearchdir=DIR  arch-dependant site libraries in DIR [LIBDIR/ruby/site_ruby]],
            [sitearchdir=$withval],
            [sitearchdir="${libdir}/ruby/site_ruby"])
SITE_DIR="`eval \"echo ${sitedir}\"`"
SITE_ARCHDIR="`eval \"echo ${sitearchdir}\"`"
case "$target_os" in
  cygwin*|mingw*|*djgpp*|os2-emx*)
    RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
    RUBY_SITE_LIB_PATH="$SITE_DIR"
    RUBY_SITE_ARCHLIB_PATH="`expr "$SITE_ARCHDIR" : "$prefix\(/.*\)"`" ||
    RUBY_SITE_ARCHLIB_PATH="$SITE_ARCHDIR";;
  *)
    RUBY_SITE_LIB_PATH="$SITE_DIR"
    RUBY_SITE_ARCHLIB_PATH="$SITE_ARCHDIR";;
esac
RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
RUBY_SITE_LIB_PATH3="${RUBY_SITE_ARCHLIB_PATH}/${MAJOR}.${MINOR}"

AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")

AC_ARG_WITH(vendordir,
	    [  --with-vendordir=DIR      vendor libraries in DIR [DATADIR/ruby/vendor_ruby]],
            [vendordir=$withval],
            [vendordir="${datadir}/ruby/vendor_ruby"])
AC_ARG_WITH(vendorarchdir,
	    [  --with-vendorarchdir=DIR  arch-dependant vendor libraries in DIR [LIBDIR/ruby/vendor_ruby]],
            [vendorarchdir=$withval],
            [vendorarchdir="${libdir}/ruby/vendor_ruby"])
VENDOR_DIR="`eval \"echo ${vendordir}\"`"
VENDOR_ARCHDIR="`eval \"echo ${vendorarchdir}\"`"
case "$target_os" in
  cygwin*|mingw*|*djgpp*|os2_emx*)
    RUBY_VENDOR_LIB_PATH="`expr "$VENDOR_DIR" : "$prefix\(/.*\)"`" ||
    RUBY_VENDOR_LIB_PATH="$VENDOR_DIR"
    RUBY_VENDOR_ARCHLIB_PATH="`expr "$VENDOR_ARCHDIR" : "$prefix\(/.*\)"`" ||
    RUBY_VENDOR_ARCHLIB_PATH="$VENDOR_ARCHDIR";;
  *)
    RUBY_VENDOR_LIB_PATH="$VENDOR_DIR"
    RUBY_VENDOR_ARCHLIB_PATH="$VENDOR_ARCHDIR";;
esac
RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
RUBY_VENDOR_LIB_PATH3="${RUBY_VENDOR_ARCHLIB_PATH}/${MAJOR}.${MINOR}"

AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")

AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(sitedir)dnl
AC_SUBST(vendordir)dnl

configure_args=$ac_configure_args
AC_SUBST(configure_args)dnl

  *) sitearch="${arch}" ;;
esac

archdir="${RUBY_LIB_PATH2}/${arch}"
sitearchdir="${RUBY_SITE_LIB_PATH3}/${sitearch}"
vendorarchdir="${RUBY_VENDOR_LIB_PATH3}/${sitearch}"

AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${archdir}")
AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${sitearchdir}")
AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCHLIB, "${vendorarchdir}")
AC_SUBST(archdir)dnl
AC_SUBST(sitearchdir)dnl
AC_SUBST(vendorarchdir)dnl

AC_ARG_WITH(search-path,
		[  --with-search-path=DIR specify the additional search path],

Lines 180-187 Link Here

(-)ruby-1.8.4-orig/ext/dl/extconf.rb (-2 / +2 lines)
180	EOF	180	EOF
181		181
182	$INSTALLFILES = [	182	$INSTALLFILES = [
183	["./dlconfig.h", "$(archdir)$(target_prefix)", "."],	183	["./dlconfig.h", "$(rubyincludedir)$(target_prefix)", "."],
184	["dl.h", "$(archdir)$(target_prefix)", ""],	184	["dl.h", "$(rubyincludedir)$(target_prefix)", ""],
185	]	185	]
186	$cleanfiles = %w[test/test.o]	186	$cleanfiles = %w[test/test.o]
187	$distcleanfiles = %w[call.func callback.func cbtable.func dlconfig.rb	187	$distcleanfiles = %w[call.func callback.func cbtable.func dlconfig.rb




      end
    end
    opts.on('--dest-dir=DIR') do |v|
      $destdir = v if ENV['DESTDIR'].to_s.empty?
    end
    opts.on('--extout=DIR') do |v|
      $extout = (v unless v.empty?)

if $extout
  Config.expand(extout = "#$extout", Config::CONFIG.merge("topdir"=>$topdir))
  if $install
    
    Config.expand(rubylibdest = "#{$destdir}#{$rubylibdir}")
    Config.expand(archdest = "#{$destdir}#{$archdir}")
    Config.expand(rubyincludedest = "#{$destdir}#{$rubyincludedir}")
    
    Dir[extout+"/**"].each{|f|
      case f
      when /^#{extout}\/#{Config::CONFIG['arch']}/
       Dir[f+"/**"].each{|f|
      	 FileUtils.cp_r(f, archdest, :verbose => true, :noop => $dryrun)
       }
      when /^#{extout}\/include/
       Dir[f+"/**"].each{|f|
      	 FileUtils.cp_r(f, rubyincludedest, :verbose => true, :noop => $dryrun)
       }
      else
	FileUtils.cp_r(f, rubylibdest, :verbose => true, :noop => $dryrun)
      end
    }
    
    exit
  end
  unless $ignore




end

def with_destdir(dir)
  return dir if !$destdir or $destdir.empty? or not ENV['DESTDIR'].empty?
  dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';'
  $destdir + dir
end

version = CONFIG["ruby_version"]
bindir = with_destdir(CONFIG["bindir"])
libdir = with_destdir(CONFIG["libdir"])
rubyincludedir = with_destdir(CONFIG["rubyincludedir"])
rubylibdir = with_destdir(CONFIG["rubylibdir"])
archlibdir = with_destdir(CONFIG["archdir"])
sitelibdir = with_destdir(CONFIG["sitelibdir"])

lib = CONFIG["LIBRUBY"]
arc = CONFIG["LIBRUBY_A"]

makedirs [bindir, libdir, rubyincludedir, rubylibdir, archlibdir, sitelibdir, sitearchlibdir]

install?(:bin) do
ruby_bin = File.join(bindir, ruby_install_name)

install dll, bindir, :mode => 0755 if enable_shared and dll != lib
install lib, libdir, :mode => 0755 unless lib == arc
install arc, libdir, :mode => 0644
install "config.h", rubyincludedir, :mode => 0644
install "rbconfig.rb", archlibdir, :mode => 0644
if CONFIG["ARCHFILE"]
  for file in CONFIG["ARCHFILE"].split

Dir.chdir srcdir

install?(:lib) do
ruby_shebang = File.join(CONFIG["bindir"], ruby_install_name).sub(/^#{Config::DESTDIR}/,'')
if File::ALT_SEPARATOR
  ruby_bin_dosish = ruby_shebang.tr(File::SEPARATOR, File::ALT_SEPARATOR)
end


install?(:bin) do
for f in Dir["*.h"]
  install f, rubyincludedir, :mode => 0644
end

if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/




$libdir = CONFIG["libdir"]
$rubylibdir = CONFIG["rubylibdir"]
$archdir = CONFIG["archdir"]
$rubyincludedir = CONFIG["rubyincludedir"]
$sitedir = CONFIG["sitedir"]
$sitelibdir = CONFIG["sitelibdir"]
$sitearchdir = CONFIG["sitearchdir"]

  [dir_re("sitedir"), "$(RUBYCOMMONDIR)"],
  [dir_re('rubylibdir'), "$(RUBYLIBDIR)"],
  [dir_re('archdir'), "$(RUBYARCHDIR)"],
  [dir_re('rubyincludedir'), "$(RUBYINCLUDEDIR)"],
  [dir_re('sitelibdir'), "$(RUBYLIBDIR)"],
  [dir_re('sitearchdir'), "$(RUBYARCHDIR)"]
]

      ['RUBYCOMMONDIR', '$(extout)'],
      ['RUBYLIBDIR',    '$(extout)$(target_prefix)'],
      ['RUBYARCHDIR',   '$(extout)/$(arch)$(target_prefix)'],
      ['RUBYINCLUDEDIR','$(extout)/include'],
      ['extout',        "#$extout"],
      ['extout_prefix', "#$extout_prefix"],
    ]

      ['RUBYCOMMONDIR', '$(rubylibdir)'],
      ['RUBYLIBDIR',    '$(rubylibdir)$(target_prefix)'],
      ['RUBYARCHDIR',   '$(archdir)$(target_prefix)'],
      ['RUBYINCLUDEDIR','$(rubyincludedir)'],
    ]
  else
    dirs = [
      ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
      ['RUBYLIBDIR',    '$(sitelibdir)$(target_prefix)'],
      ['RUBYARCHDIR',   '$(sitearchdir)$(target_prefix)'],
      ['RUBYINCLUDEDIR','$(rubyincludedir)'],
    ]
  end
  dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]

topdir = File.dirname(libdir = File.dirname(__FILE__))
extdir = File.expand_path("ext", topdir)
$extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/"
if not $extmk and File.exist?(Config::CONFIG["rubyincludedir"] + "/ruby.h")
  $hdrdir = $topdir = Config::CONFIG["rubyincludedir"]
elsif File.exist?(($top_srcdir ||= topdir)  + "/ruby.h") and
    File.exist?(($topdir ||= Config::CONFIG["topdir"]) + "/config.h")
  $hdrdir = $top_srcdir

                              'LDFLAGS' => "#$LDFLAGS #{ldflags}",
                              'LIBPATH' => libpathflag(libpath),
                              'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
                              'LIBS' => "#$LIBRUBYARG #{opt} #$LIBS"))
end

def cc_command(opt="")





prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM
print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "ENV['DESTDIR'].to_s unless defined? DESTDIR\n"
print "  CONFIG = {}\n"
print "  CONFIG[\"DESTDIR\"] = DESTDIR\n"


print v_fast, v_others
print <<EOS
  CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
  CONFIG["rubylibdir"] = "$(datadir)/ruby/$(ruby_version)"
  CONFIG["rubyincludedir"] = "$(includedir)/ruby/$(ruby_version)"
  CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
  CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
  if defined?(VENDOR_SPECIFIC) && VENDOR_SPECIFIC
    CONFIG["sitedir"] = "$(vendordir)"
    CONFIG["sitelibdir"] = "$(vendordir)/$(ruby_version)"
    CONFIG["sitearchdir"] = "$(vendorarchdir)"
  end
  CONFIG["CFLAGS"] += " -I"+CONFIG["rubyincludedir"]
  CONFIG["topdir"] = File.dirname(__FILE__)
  MAKEFILE_CONFIG = {}
  CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}

Lines 292-302 Link Here

(-)ruby-1.8.4-orig/ruby.c (+3 lines)
292	#endif	292	#endif
293		293
294	ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB2));	294	ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB2));
		295	ruby_incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB2));
295	#ifdef RUBY_SITE_THIN_ARCHLIB	296	#ifdef RUBY_SITE_THIN_ARCHLIB
296	ruby_incpush(RUBY_RELATIVE(RUBY_SITE_THIN_ARCHLIB));	297	ruby_incpush(RUBY_RELATIVE(RUBY_SITE_THIN_ARCHLIB));
297	#endif	298	#endif
298	ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));	299	ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
299	ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));	300	ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
		301	ruby_incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCHLIB));
		302	ruby_incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB));
300		303
301	ruby_incpush(RUBY_RELATIVE(RUBY_LIB));	304	ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
302	#ifdef RUBY_THIN_ARCHLIB	305	#ifdef RUBY_THIN_ARCHLIB

Return to bug 9401

Lines 72-78 Link Here

(-)ruby-1.8.4-orig/configure.in (-8 / +53 lines)
72	program_prefix=	72	program_prefix=
73	fi	73	fi
74	AC_CANONICAL_TARGET	74	AC_CANONICAL_TARGET
75	target_os=`echo $target_os \| sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
76		75
77	dnl checks for fat-binary	76	dnl checks for fat-binary
78	AC_ARG_ENABLE(fat-binary,	77	AC_ARG_ENABLE(fat-binary,
Lines 1438-1469 Link Here
1438	RUBY_LIB_PREFIX="/lib/ruby"	1437	RUBY_LIB_PREFIX="/lib/ruby"
1439	;;	1438	;;
1440	*)	1439	*)
1441	RUBY_LIB_PREFIX="${prefix}/lib/ruby"	1440	RUBY_LIB_PREFIX="${datadir}/ruby"
		1441	RUBY_LIB_PREFIX2="${libdir}/ruby"
1442	;;	1442	;;
1443	esac	1443	esac
1444	RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"	1444	RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
		1445	RUBY_LIB_PATH2="${RUBY_LIB_PREFIX2}/${MAJOR}.${MINOR}"
1445		1446
1446	AC_ARG_WITH(sitedir,	1447	AC_ARG_WITH(sitedir,
1447	[ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]],	1448	[ --with-sitedir=DIR site libraries in DIR [DATADIR/ruby/site_ruby]],
1448	[sitedir=$withval],	1449	[sitedir=$withval],
1449	[sitedir='${prefix}/lib/ruby/site_ruby'])	1450	[sitedir="${datadir}/ruby/site_ruby"])
		1451	AC_ARG_WITH(sitearchdir,
		1452	[ --with-sitearchdir=DIR arch-dependant site libraries in DIR [LIBDIR/ruby/site_ruby]],
		1453	[sitearchdir=$withval],
		1454	[sitearchdir="${libdir}/ruby/site_ruby"])
1450	SITE_DIR="`eval \"echo ${sitedir}\"`"	1455	SITE_DIR="`eval \"echo ${sitedir}\"`"
		1456	SITE_ARCHDIR="`eval \"echo ${sitearchdir}\"`"
1451	case "$target_os" in	1457	case "$target_os" in
1452	cygwin\|mingw\|djgpp\|os2-emx*)	1458	cygwin\|mingw\|djgpp\|os2-emx*)
1453	RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" \|\|	1459	RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" \|\|
1454	RUBY_SITE_LIB_PATH="$SITE_DIR";;	1460	RUBY_SITE_LIB_PATH="$SITE_DIR"
		1461	RUBY_SITE_ARCHLIB_PATH="`expr "$SITE_ARCHDIR" : "$prefix\(/.*\)"`" \|\|
		1462	RUBY_SITE_ARCHLIB_PATH="$SITE_ARCHDIR";;
1455	*)	1463	*)
1456	RUBY_SITE_LIB_PATH="$SITE_DIR";;	1464	RUBY_SITE_LIB_PATH="$SITE_DIR"
		1465	RUBY_SITE_ARCHLIB_PATH="$SITE_ARCHDIR";;
1457	esac	1466	esac
1458	RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"	1467	RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
		1468	RUBY_SITE_LIB_PATH3="${RUBY_SITE_ARCHLIB_PATH}/${MAJOR}.${MINOR}"
1459		1469
1460	AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")	1470	AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
1461	AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")	1471	AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
1462	AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")	1472	AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
1463		1473
		1474	AC_ARG_WITH(vendordir,
		1475	[ --with-vendordir=DIR vendor libraries in DIR [DATADIR/ruby/vendor_ruby]],
		1476	[vendordir=$withval],
		1477	[vendordir="${datadir}/ruby/vendor_ruby"])
		1478	AC_ARG_WITH(vendorarchdir,
		1479	[ --with-vendorarchdir=DIR arch-dependant vendor libraries in DIR [LIBDIR/ruby/vendor_ruby]],
		1480	[vendorarchdir=$withval],
		1481	[vendorarchdir="${libdir}/ruby/vendor_ruby"])
		1482	VENDOR_DIR="`eval \"echo ${vendordir}\"`"
		1483	VENDOR_ARCHDIR="`eval \"echo ${vendorarchdir}\"`"
		1484	case "$target_os" in
		1485	cygwin\|mingw\|djgpp\|os2_emx*)
		1486	RUBY_VENDOR_LIB_PATH="`expr "$VENDOR_DIR" : "$prefix\(/.*\)"`" \|\|
		1487	RUBY_VENDOR_LIB_PATH="$VENDOR_DIR"
		1488	RUBY_VENDOR_ARCHLIB_PATH="`expr "$VENDOR_ARCHDIR" : "$prefix\(/.*\)"`" \|\|
		1489	RUBY_VENDOR_ARCHLIB_PATH="$VENDOR_ARCHDIR";;
		1490	*)
		1491	RUBY_VENDOR_LIB_PATH="$VENDOR_DIR"
		1492	RUBY_VENDOR_ARCHLIB_PATH="$VENDOR_ARCHDIR";;
		1493	esac
		1494	RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
		1495	RUBY_VENDOR_LIB_PATH3="${RUBY_VENDOR_ARCHLIB_PATH}/${MAJOR}.${MINOR}"
		1496
		1497	AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
		1498	AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")
		1499
1464	AC_SUBST(arch)dnl	1500	AC_SUBST(arch)dnl
1465	AC_SUBST(sitearch)dnl	1501	AC_SUBST(sitearch)dnl
1466	AC_SUBST(sitedir)dnl	1502	AC_SUBST(sitedir)dnl
		1503	AC_SUBST(vendordir)dnl
1467		1504
1468	configure_args=$ac_configure_args	1505	configure_args=$ac_configure_args
1469	AC_SUBST(configure_args)dnl	1506	AC_SUBST(configure_args)dnl
Lines 1487-1494 Link Here
1487	*) sitearch="${arch}" ;;	1524	*) sitearch="${arch}" ;;
1488	esac	1525	esac
1489		1526
1490	AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")	1527	archdir="${RUBY_LIB_PATH2}/${arch}"
1491	AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")	1528	sitearchdir="${RUBY_SITE_LIB_PATH3}/${sitearch}"
		1529	vendorarchdir="${RUBY_VENDOR_LIB_PATH3}/${sitearch}"
		1530
		1531	AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${archdir}")
		1532	AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${sitearchdir}")
		1533	AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCHLIB, "${vendorarchdir}")
		1534	AC_SUBST(archdir)dnl
		1535	AC_SUBST(sitearchdir)dnl
		1536	AC_SUBST(vendorarchdir)dnl
1492		1537
1493	AC_ARG_WITH(search-path,	1538	AC_ARG_WITH(search-path,
1494	[ --with-search-path=DIR specify the additional search path],	1539	[ --with-search-path=DIR specify the additional search path],

Lines 222-228 Link Here

(-)ruby-1.8.4-orig/ext/extmk.rb (-3 / +21 lines)
222	end	222	end
223	end	223	end
224	opts.on('--dest-dir=DIR') do \|v\|	224	opts.on('--dest-dir=DIR') do \|v\|
225	$destdir = v	225	$destdir = v if ENV['DESTDIR'].to_s.empty?
226	end	226	end
227	opts.on('--extout=DIR') do \|v\|	227	opts.on('--extout=DIR') do \|v\|
228	$extout = (v unless v.empty?)	228	$extout = (v unless v.empty?)
Lines 379-386 Link Here
379	if $extout	379	if $extout
380	Config.expand(extout = "#$extout", Config::CONFIG.merge("topdir"=>$topdir))	380	Config.expand(extout = "#$extout", Config::CONFIG.merge("topdir"=>$topdir))
381	if $install	381	if $install
382	Config.expand(dest = "#{$destdir}#{$rubylibdir}")	382
383	FileUtils.cp_r(extout+"/.", dest, :verbose => true, :noop => $dryrun)	383	Config.expand(rubylibdest = "#{$destdir}#{$rubylibdir}")
		384	Config.expand(archdest = "#{$destdir}#{$archdir}")
		385	Config.expand(rubyincludedest = "#{$destdir}#{$rubyincludedir}")
		386
		387	Dir[extout+"/**"].each{\|f\|
		388	case f
		389	when /^#{extout}\/#{Config::CONFIG['arch']}/
		390	Dir[f+"/**"].each{\|f\|
		391	FileUtils.cp_r(f, archdest, :verbose => true, :noop => $dryrun)
		392	}
		393	when /^#{extout}\/include/
		394	Dir[f+"/**"].each{\|f\|
		395	FileUtils.cp_r(f, rubyincludedest, :verbose => true, :noop => $dryrun)
		396	}
		397	else
		398	FileUtils.cp_r(f, rubylibdest, :verbose => true, :noop => $dryrun)
		399	end
		400	}
		401
384	exit	402	exit
385	end	403	end
386	unless $ignore	404	unless $ignore

Lines 76-82 Link Here

(-)ruby-1.8.4-orig/mkconfig.rb (-3 / +10 lines)
76		76
77	prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM	77	prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM
78	print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"	78	print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
79	print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] \|\| " : ""), "'' unless defined? DESTDIR\n"	79	print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] \|\| " : ""), "ENV['DESTDIR'].to_s unless defined? DESTDIR\n"
80	print " CONFIG = {}\n"	80	print " CONFIG = {}\n"
81	print " CONFIG[\"DESTDIR\"] = DESTDIR\n"	81	print " CONFIG[\"DESTDIR\"] = DESTDIR\n"
82		82
Lines 108-117 Link Here
108	print v_fast, v_others	108	print v_fast, v_others
109	print <<EOS	109	print <<EOS
110	CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"	110	CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
111	CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"	111	CONFIG["rubylibdir"] = "$(datadir)/ruby/$(ruby_version)"
112	CONFIG["archdir"] = "$(rubylibdir)/$(arch)"	112	CONFIG["rubyincludedir"] = "$(includedir)/ruby/$(ruby_version)"
		113	CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
113	CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"	114	CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
114	CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"	115	CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
		116	if defined?(VENDOR_SPECIFIC) && VENDOR_SPECIFIC
		117	CONFIG["sitedir"] = "$(vendordir)"
		118	CONFIG["sitelibdir"] = "$(vendordir)/$(ruby_version)"
		119	CONFIG["sitearchdir"] = "$(vendorarchdir)"
		120	end
		121	CONFIG["CFLAGS"] += " -I"+CONFIG["rubyincludedir"]
115	CONFIG["topdir"] = File.dirname(__FILE__)	122	CONFIG["topdir"] = File.dirname(__FILE__)
116	MAKEFILE_CONFIG = {}	123	MAKEFILE_CONFIG = {}
117	CONFIG.each{\|k,v\| MAKEFILE_CONFIG[k] = v.dup}	124	CONFIG.each{\|k,v\| MAKEFILE_CONFIG[k] = v.dup}

Lines 82-88 Link Here

(-)ruby-1.8.4-orig/instruby.rb (-5 / +6 lines)
82	end	82	end
83		83
84	def with_destdir(dir)	84	def with_destdir(dir)
85	return dir if !$destdir or $destdir.empty?	85	return dir if !$destdir or $destdir.empty? or not ENV['DESTDIR'].empty?
86	dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';'	86	dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';'
87	$destdir + dir	87	$destdir + dir
88	end	88	end
Lines 95-100 Link Here
95	version = CONFIG["ruby_version"]	95	version = CONFIG["ruby_version"]
96	bindir = with_destdir(CONFIG["bindir"])	96	bindir = with_destdir(CONFIG["bindir"])
97	libdir = with_destdir(CONFIG["libdir"])	97	libdir = with_destdir(CONFIG["libdir"])
		98	rubyincludedir = with_destdir(CONFIG["rubyincludedir"])
98	rubylibdir = with_destdir(CONFIG["rubylibdir"])	99	rubylibdir = with_destdir(CONFIG["rubylibdir"])
99	archlibdir = with_destdir(CONFIG["archdir"])	100	archlibdir = with_destdir(CONFIG["archdir"])
100	sitelibdir = with_destdir(CONFIG["sitelibdir"])	101	sitelibdir = with_destdir(CONFIG["sitelibdir"])
Lines 106-112 Link Here
106	lib = CONFIG["LIBRUBY"]	107	lib = CONFIG["LIBRUBY"]
107	arc = CONFIG["LIBRUBY_A"]	108	arc = CONFIG["LIBRUBY_A"]
108		109
109	makedirs [bindir, libdir, rubylibdir, archlibdir, sitelibdir, sitearchlibdir]	110	makedirs [bindir, libdir, rubyincludedir, rubylibdir, archlibdir, sitelibdir, sitearchlibdir]
110		111
111	install?(:bin) do	112	install?(:bin) do
112	ruby_bin = File.join(bindir, ruby_install_name)	113	ruby_bin = File.join(bindir, ruby_install_name)
Lines 118-124 Link Here
118	install dll, bindir, :mode => 0755 if enable_shared and dll != lib	119	install dll, bindir, :mode => 0755 if enable_shared and dll != lib
119	install lib, libdir, :mode => 0755 unless lib == arc	120	install lib, libdir, :mode => 0755 unless lib == arc
120	install arc, libdir, :mode => 0644	121	install arc, libdir, :mode => 0644
121	install "config.h", archlibdir, :mode => 0644	122	install "config.h", rubyincludedir, :mode => 0644
122	install "rbconfig.rb", archlibdir, :mode => 0644	123	install "rbconfig.rb", archlibdir, :mode => 0644
123	if CONFIG["ARCHFILE"]	124	if CONFIG["ARCHFILE"]
124	for file in CONFIG["ARCHFILE"].split	125	for file in CONFIG["ARCHFILE"].split
Lines 136-142 Link Here
136	Dir.chdir srcdir	137	Dir.chdir srcdir
137		138
138	install?(:lib) do	139	install?(:lib) do
139	ruby_shebang = File.join(CONFIG["bindir"], ruby_install_name)	140	ruby_shebang = File.join(CONFIG["bindir"], ruby_install_name).sub(/^#{Config::DESTDIR}/,'')
140	if File::ALT_SEPARATOR	141	if File::ALT_SEPARATOR
141	ruby_bin_dosish = ruby_shebang.tr(File::SEPARATOR, File::ALT_SEPARATOR)	142	ruby_bin_dosish = ruby_shebang.tr(File::SEPARATOR, File::ALT_SEPARATOR)
142	end	143	end
Lines 192-198 Link Here
192		193
193	install?(:bin) do	194	install?(:bin) do
194	for f in Dir["*.h"]	195	for f in Dir["*.h"]
195	install f, archlibdir, :mode => 0644	196	install f, rubyincludedir, :mode => 0644
196	end	197	end
197		198
198	if RUBY_PLATFORM =~ /mswin32\|mingw\|bccwin32/	199	if RUBY_PLATFORM =~ /mswin32\|mingw\|bccwin32/

Lines 47-52 Link Here

(-)ruby-1.8.4-orig/lib/mkmf.rb (-3 / +8 lines)
47	$libdir = CONFIG["libdir"]	47	$libdir = CONFIG["libdir"]
48	$rubylibdir = CONFIG["rubylibdir"]	48	$rubylibdir = CONFIG["rubylibdir"]
49	$archdir = CONFIG["archdir"]	49	$archdir = CONFIG["archdir"]
		50	$rubyincludedir = CONFIG["rubyincludedir"]
50	$sitedir = CONFIG["sitedir"]	51	$sitedir = CONFIG["sitedir"]
51	$sitelibdir = CONFIG["sitelibdir"]	52	$sitelibdir = CONFIG["sitelibdir"]
52	$sitearchdir = CONFIG["sitearchdir"]	53	$sitearchdir = CONFIG["sitearchdir"]
Lines 74-79 Link Here
74	[dir_re("sitedir"), "$(RUBYCOMMONDIR)"],	75	[dir_re("sitedir"), "$(RUBYCOMMONDIR)"],
75	[dir_re('rubylibdir'), "$(RUBYLIBDIR)"],	76	[dir_re('rubylibdir'), "$(RUBYLIBDIR)"],
76	[dir_re('archdir'), "$(RUBYARCHDIR)"],	77	[dir_re('archdir'), "$(RUBYARCHDIR)"],
		78	[dir_re('rubyincludedir'), "$(RUBYINCLUDEDIR)"],
77	[dir_re('sitelibdir'), "$(RUBYLIBDIR)"],	79	[dir_re('sitelibdir'), "$(RUBYLIBDIR)"],
78	[dir_re('sitearchdir'), "$(RUBYARCHDIR)"]	80	[dir_re('sitearchdir'), "$(RUBYARCHDIR)"]
79	]	81	]
Lines 84-89 Link Here
84	['RUBYCOMMONDIR', '$(extout)'],	86	['RUBYCOMMONDIR', '$(extout)'],
85	['RUBYLIBDIR', '$(extout)$(target_prefix)'],	87	['RUBYLIBDIR', '$(extout)$(target_prefix)'],
86	['RUBYARCHDIR', '$(extout)/$(arch)$(target_prefix)'],	88	['RUBYARCHDIR', '$(extout)/$(arch)$(target_prefix)'],
		89	['RUBYINCLUDEDIR','$(extout)/include'],
87	['extout', "#$extout"],	90	['extout', "#$extout"],
88	['extout_prefix', "#$extout_prefix"],	91	['extout_prefix', "#$extout_prefix"],
89	]	92	]
Lines 92-103 Link Here
92	['RUBYCOMMONDIR', '$(rubylibdir)'],	95	['RUBYCOMMONDIR', '$(rubylibdir)'],
93	['RUBYLIBDIR', '$(rubylibdir)$(target_prefix)'],	96	['RUBYLIBDIR', '$(rubylibdir)$(target_prefix)'],
94	['RUBYARCHDIR', '$(archdir)$(target_prefix)'],	97	['RUBYARCHDIR', '$(archdir)$(target_prefix)'],
		98	['RUBYINCLUDEDIR','$(rubyincludedir)'],
95	]	99	]
96	else	100	else
97	dirs = [	101	dirs = [
98	['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],	102	['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'],
99	['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'],	103	['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'],
100	['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'],	104	['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'],
		105	['RUBYINCLUDEDIR','$(rubyincludedir)'],
101	]	106	]
102	end	107	end
103	dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]	108	dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]
Lines 112-119 Link Here
112	topdir = File.dirname(libdir = File.dirname(__FILE__))	117	topdir = File.dirname(libdir = File.dirname(__FILE__))
113	extdir = File.expand_path("ext", topdir)	118	extdir = File.expand_path("ext", topdir)
114	$extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/"	119	$extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/"
115	if not $extmk and File.exist?(Config::CONFIG["archdir"] + "/ruby.h")	120	if not $extmk and File.exist?(Config::CONFIG["rubyincludedir"] + "/ruby.h")
116	$hdrdir = $topdir = Config::CONFIG["archdir"]	121	$hdrdir = $topdir = Config::CONFIG["rubyincludedir"]
117	elsif File.exist?(($top_srcdir \|\|= topdir) + "/ruby.h") and	122	elsif File.exist?(($top_srcdir \|\|= topdir) + "/ruby.h") and
118	File.exist?(($topdir \|\|= Config::CONFIG["topdir"]) + "/config.h")	123	File.exist?(($topdir \|\|= Config::CONFIG["topdir"]) + "/config.h")
119	$hdrdir = $top_srcdir	124	$hdrdir = $top_srcdir
Lines 269-275 Link Here
269	'LDFLAGS' => "#$LDFLAGS #{ldflags}",	274	'LDFLAGS' => "#$LDFLAGS #{ldflags}",
270	'LIBPATH' => libpathflag(libpath),	275	'LIBPATH' => libpathflag(libpath),
271	'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",	276	'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
272	'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS"))	277	'LIBS' => "#$LIBRUBYARG #{opt} #$LIBS"))
273	end	278	end
274		279
275	def cc_command(opt="")	280	def cc_command(opt="")