summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--djgpp/config.hin10
-rw-r--r--djgpp/config.sed (renamed from djgpp/config.status)6
-rw-r--r--djgpp/configure.bat24
3 files changed, 20 insertions, 20 deletions
diff --git a/djgpp/config.hin b/djgpp/config.hin
index 089fe69c04c..973a0db93de 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.status b/djgpp/config.sed
index f0d2891906b..fac523e8a5f 100644
--- a/djgpp/config.status
+++ b/djgpp/config.sed
@@ -59,10 +59,12 @@ s%@arch@%i386-msdosdjgpp%g
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@%/usr/local/lib/ruby/i386-msdosdjgpp%
+s%@archlib@%/lib/ruby/i386-msdosdjgpp%
;s%|| true%%
;/\/dev\/null/ {
;s,/dev/null 2>&1, nul,
@@ -71,6 +73,8 @@ s%@archlib@%/usr/local/lib/ruby/i386-msdosdjgpp%
;/^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/configure.bat b/djgpp/configure.bat
index f4d0105f773..dbb4a085283 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.