From edc3d8d6c6577f47955fe15283e8628b2ce2ac0d Mon Sep 17 00:00:00 2001 From: eban Date: Sat, 5 Aug 2000 07:32:54 +0000 Subject: eban git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- djgpp/config.hin | 10 +++---- djgpp/config.sed | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++ djgpp/config.status | 76 -------------------------------------------------- djgpp/configure.bat | 24 +++++++--------- 4 files changed, 95 insertions(+), 95 deletions(-) create mode 100644 djgpp/config.sed delete mode 100644 djgpp/config.status diff --git a/djgpp/config.hin b/djgpp/config.hin index 089fe69c0..973a0db93 100644 --- a/djgpp/config.hin +++ b/djgpp/config.hin @@ -64,9 +64,9 @@ #define RSHIFT(x,y) ((x)>>y) #define FILE_COUNT _cnt #define DLEXT ".o" -#define RUBY_LIB "/usr/local/lib/ruby/@MAJOR@.@MINOR@" -#define RUBY_SITE_LIB "/usr/local/lib/ruby/site_ruby" -#define RUBY_SITE_LIB2 "/usr/local/lib/ruby/site_ruby/@MAJOR@.@MINOR@" +#define RUBY_LIB "/lib/ruby/@MAJOR@.@MINOR@" +#define RUBY_SITE_LIB "/lib/ruby/site_ruby" +#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/@MAJOR@.@MINOR@" #define RUBY_PLATFORM "i386-msdosdjgpp" -#define RUBY_ARCHLIB "/usr/local/lib/ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp" -#define RUBY_SITE_ARCHLIB "/usr/local/lib/ruby/site_ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp" +#define RUBY_ARCHLIB "/lib/ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp" +#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp" diff --git a/djgpp/config.sed b/djgpp/config.sed new file mode 100644 index 000000000..fac523e8a --- /dev/null +++ b/djgpp/config.sed @@ -0,0 +1,80 @@ +/^SHELL/s,/bin/sh,$(COMPSEC), +s%@srcdir@%.%g +s%@top_srcdir@%..% +s%@CFLAGS@%-O2%g +s%@CPPFLAGS@%%g +s%@CXXFLAGS@%%g +s%@LDFLAGS@%%g +s%@LIBS@%-lm %g +s%@exec_prefix@%${prefix}%g +s%@prefix@%/usr/local%g +s%@program_transform_name@%s,x,x,%g +s%@bindir@%${exec_prefix}/bin%g +s%@sbindir@%${exec_prefix}/sbin%g +s%@libexecdir@%${exec_prefix}/libexec%g +s%@datadir@%${prefix}/share%g +s%@sysconfdir@%${prefix}/etc%g +s%@sharedstatedir@%${prefix}/com%g +s%@localstatedir@%${prefix}/var%g +s%@libdir@%${exec_prefix}/lib%g +s%@includedir@%${prefix}/include%g +s%@oldincludedir@%/usr/include%g +s%@infodir@%${prefix}/info%g +s%@mandir@%${prefix}/man%g +s%@host@%i386-pc-msdosdjgpp%g +s%@host_alias@%i386-msdosdjgpp%g +s%@host_cpu@%i386%g +s%@host_vendor@%pc%g +s%@host_os@%msdosdjgpp%g +s%@CC@%gcc%g +s%@CPP@%gcc -E%g +s%@YACC@%bison -y%g +s%@RANLIB@%ranlib%g +s%@AR@%ar%g +s%@INSTALL_PROGRAM@%${INSTALL}%g +s%@INSTALL_DATA@%${INSTALL} -m 644%g +s%@SET_MAKE@%%g +s%@LIBOBJS@% crypt.o flock.o vsnprintf.o%g +s%@ALLOCA@%%g +s%@DEFAULT_KCODE@%%g +s%@EXEEXT@%.exe%g +s%@OBJEXT@%o%g +s%@XLDFLAGS@%%g +s%@DLDFLAGS@%%g +s%@STATIC@%%g +s%@CCDLFLAGS@%%g +s%@LDSHARED@%ld%g +s%@DLEXT@%o%g +s%@STRIP@%strip%g +s%@EXTSTATIC@%%g +s%@binsuffix@%.exe%g +s%@setup@%Setup.dj%g +s%@LIBRUBY@%libruby.a%g +s%@LIBRUBY_A@%libruby.a%g +s%@LIBRUBYARG@%libruby.a%g +s%@LIBRUBY_SO@%%g +s%@SOLIBS@%%g +s%@arch@%i386-msdosdjgpp%g +;s%/bin/rm%rm% +s%@DLDLIBS@%-lc%g +s%@PREP@%% +s%@RUBY_INSTALL_NAME@%ruby%g +s%@RUBY_SO_NAME@%%g +s%@arch@%i386-msdosdjgpp%g +s%@sitedir@%${prefix}/lib/ruby/site_ruby%g +s%@configure_args@%%g +s%@MINIRUBY@%./miniruby% +s%@archlib@%/lib/ruby/i386-msdosdjgpp% +;s%|| true%% +;/\/dev\/null/ { +;s,/dev/null 2>&1, nul, +;s,2> /dev/null,, +;} +;/^config.status/ { +; N;N;N;N;N;d +;} +;s%mv -f y\.tab\.c%if exist parse.c del parse.c\ + ren y_tab.c% +;s%y\.tab\.c%y_tab.c% +/^,THIS_IS_DUMMY_PATTERN_/i\ +ac_given_srcdir=. diff --git a/djgpp/config.status b/djgpp/config.status deleted file mode 100644 index f0d289190..000000000 --- a/djgpp/config.status +++ /dev/null @@ -1,76 +0,0 @@ -/^SHELL/s,/bin/sh,$(COMPSEC), -s%@srcdir@%.%g -s%@top_srcdir@%..% -s%@CFLAGS@%-O2%g -s%@CPPFLAGS@%%g -s%@CXXFLAGS@%%g -s%@LDFLAGS@%%g -s%@LIBS@%-lm %g -s%@exec_prefix@%${prefix}%g -s%@prefix@%/usr/local%g -s%@program_transform_name@%s,x,x,%g -s%@bindir@%${exec_prefix}/bin%g -s%@sbindir@%${exec_prefix}/sbin%g -s%@libexecdir@%${exec_prefix}/libexec%g -s%@datadir@%${prefix}/share%g -s%@sysconfdir@%${prefix}/etc%g -s%@sharedstatedir@%${prefix}/com%g -s%@localstatedir@%${prefix}/var%g -s%@libdir@%${exec_prefix}/lib%g -s%@includedir@%${prefix}/include%g -s%@oldincludedir@%/usr/include%g -s%@infodir@%${prefix}/info%g -s%@mandir@%${prefix}/man%g -s%@host@%i386-pc-msdosdjgpp%g -s%@host_alias@%i386-msdosdjgpp%g -s%@host_cpu@%i386%g -s%@host_vendor@%pc%g -s%@host_os@%msdosdjgpp%g -s%@CC@%gcc%g -s%@CPP@%gcc -E%g -s%@YACC@%bison -y%g -s%@RANLIB@%ranlib%g -s%@AR@%ar%g -s%@INSTALL_PROGRAM@%${INSTALL}%g -s%@INSTALL_DATA@%${INSTALL} -m 644%g -s%@SET_MAKE@%%g -s%@LIBOBJS@% crypt.o flock.o vsnprintf.o%g -s%@ALLOCA@%%g -s%@DEFAULT_KCODE@%%g -s%@EXEEXT@%.exe%g -s%@OBJEXT@%o%g -s%@XLDFLAGS@%%g -s%@DLDFLAGS@%%g -s%@STATIC@%%g -s%@CCDLFLAGS@%%g -s%@LDSHARED@%ld%g -s%@DLEXT@%o%g -s%@STRIP@%strip%g -s%@EXTSTATIC@%%g -s%@binsuffix@%.exe%g -s%@setup@%Setup.dj%g -s%@LIBRUBY@%libruby.a%g -s%@LIBRUBY_A@%libruby.a%g -s%@LIBRUBYARG@%libruby.a%g -s%@LIBRUBY_SO@%%g -s%@SOLIBS@%%g -s%@arch@%i386-msdosdjgpp%g -;s%/bin/rm%rm% -s%@DLDLIBS@%-lc%g -s%@PREP@%% -s%@RUBY_INSTALL_NAME@%ruby%g -s%@arch@%i386-msdosdjgpp%g -s%@sitedir@%${prefix}/lib/ruby/site_ruby%g -s%@MINIRUBY@%./miniruby% -s%@archlib@%/usr/local/lib/ruby/i386-msdosdjgpp% -;s%|| true%% -;/\/dev\/null/ { -;s,/dev/null 2>&1, nul, -;s,2> /dev/null,, -;} -;/^config.status/ { -; N;N;N;N;N;d -;} -;s%y\.tab\.c%y_tab.c% -/^,THIS_IS_DUMMY_PATTERN_/i\ -ac_given_srcdir=. diff --git a/djgpp/configure.bat b/djgpp/configure.bat index f4d0105f7..dbb4a0852 100644 --- a/djgpp/configure.bat +++ b/djgpp/configure.bat @@ -1,25 +1,21 @@ @echo off -set _dj_=djgpp -if exist djgpp\nul goto top - cd .. -:top -if exist %_dj_%\version.sed goto exist - sed -n -f %_dj_%\mkver.sed < version.h > %_dj_%\version.sed +if exist configure.bat cd .. +if exist djgpp\version.sed goto exist + sed -n -f djgpp\mkver.sed < version.h > djgpp\version.sed :exist -set _convert_=-f %_dj_%\config.status -f %_dj_%\version.sed -sed %_convert_% < Makefile.in > Makefile -sed %_convert_% < ext\extmk.rb.in > ext\extmk.rb -sed %_convert_% < %_dj_%\config.hin > config.h +set _conv_=-f djgpp\config.sed -f djgpp\version.sed +sed %_conv_% < Makefile.in > Makefile +sed %_conv_% < ext\extmk.rb.in > ext\extmk.rb +sed %_conv_% < djgpp\config.hin > config.h echo LFN check > 12345678 sed -n /LFN/d 123456789 > nul if errorlevel 2 goto LFN copy missing\vsnprintf.c missing\vsnprint.c > nul - copy %_dj_%\config.status config.sta > nul + copy djgpp\config.sed config.sta > nul goto end :LFN - copy %_dj_%\config.status config.status > nul + copy djgpp\config.sed config.status > nul :end -set _dj_= -set _convert_= +set _conv_= del 12345678 echo Now you must run a make. -- cgit