diff options
| -rw-r--r-- | config_h.dj | 5 | ||||
| -rw-r--r-- | configure | 12 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | instruby.rb | 2 | ||||
| -rw-r--r-- | version.h | 4 | ||||
| -rw-r--r-- | win32/config.h | 7 | ||||
| -rw-r--r-- | win32/config.status | 2 |
7 files changed, 28 insertions, 13 deletions
diff --git a/config_h.dj b/config_h.dj index 36b80537fd..a7763bea14 100644 --- a/config_h.dj +++ b/config_h.dj @@ -65,7 +65,8 @@ #define FILE_COUNT _cnt #define DLEXT ".o" #define RUBY_LIB "/usr/local/lib/ruby/1.4" -#define RUBY_SITE_LIB "/usr/local/lib/ruby/1.4/site_ruby" +#define RUBY_SITE_LIB "/usr/local/lib/ruby/site_ruby" +#define RUBY_SITE_LIB2 "/usr/local/lib/ruby/site_ruby/1.4" #define RUBY_PLATFORM "i386-djgpp" #define RUBY_ARCHLIB "/usr/local/lib/ruby/1.4/i386-djgpp" -#define RUBY_SITE_ARCHLIB "/usr/local/lib/ruby/1.4/site_ruby/i386-djgpp" +#define RUBY_SITE_ARCHLIB "/usr/local/lib/ruby/site_ruby/1.4/i386-djgpp" @@ -4678,16 +4678,24 @@ test "$program_suffix" != NONE && ri_suffix=$program_suffix RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}" -RUBY_LIB_PATH="${prefix}/lib/ruby/${MAJOR}.${MINOR}" +RUBY_LIB_PREFIX="${prefix}/lib/ruby" +RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}" +RUBY_SITE_LIB_PATH="${RUBY_LIB_PREFIX}/site_ruby" +RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}" + cat >> confdefs.h <<EOF #define RUBY_LIB "${RUBY_LIB_PATH}" EOF -RUBY_SITE_LIB_PATH="${RUBY_LIB_PATH}/site_ruby" cat >> confdefs.h <<EOF #define RUBY_SITE_LIB "${RUBY_SITE_LIB_PATH}" EOF +cat >> confdefs.h <<EOF +#define RUBY_SITE_LIB2 "${RUBY_SITE_LIB_PATH2}" +EOF + + configure_args=$ac_configure_args diff --git a/configure.in b/configure.in index 2d7157340a..632b79bf14 100644 --- a/configure.in +++ b/configure.in @@ -774,10 +774,15 @@ test "$program_suffix" != NONE && ri_suffix=$program_suffix RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}" -RUBY_LIB_PATH="${prefix}/lib/ruby/${MAJOR}.${MINOR}" +RUBY_LIB_PREFIX="${prefix}/lib/ruby" +RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}" +RUBY_SITE_LIB_PATH="${RUBY_LIB_PREFIX}/site_ruby" +RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}" + AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}") -RUBY_SITE_LIB_PATH="${RUBY_LIB_PATH}/site_ruby" AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}") +AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}") + AC_SUBST(arch)dnl configure_args=$ac_configure_args diff --git a/instruby.rb b/instruby.rb index 3222f72194..3e2c85be85 100644 --- a/instruby.rb +++ b/instruby.rb @@ -24,7 +24,7 @@ bindir = destdir+CONFIG["bindir"] libdir = destdir+CONFIG["libdir"] rubylibdir = destdir+CONFIG["prefix"]+"/lib/ruby"+version archlibdir = rubylibdir+arch -sitelibdir = destdir+CONFIG["prefix"]+"/lib/site_ruby"+version +sitelibdir = destdir+CONFIG["prefix"]+"/lib/ruby/site_ruby"+version sitearchlibdir = sitelibdir+arch mandir = destdir+CONFIG["mandir"] + "/man1" wdir = Dir.getwd @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.4.4" -#define RUBY_RELEASE_DATE "2000-03-13" +#define RUBY_RELEASE_DATE "2000-03-14" #define RUBY_VERSION_CODE 144 -#define RUBY_RELEASE_CODE 20000313 +#define RUBY_RELEASE_CODE 20000314 diff --git a/win32/config.h b/win32/config.h index 3ded77ebfd..5c8d3dd8c0 100644 --- a/win32/config.h +++ b/win32/config.h @@ -40,10 +40,11 @@ #define FILE_COUNT _cnt #define DLEXT ".dll" #define RUBY_LIB "/usr/local/lib/ruby/1.4" -#define RUBY_ARCHLIB "/usr/local/lib/ruby/1.4/i386-mswin32" -#define RUBY_SITE_LIB "/usr/local/lib/ruby/1.4/site_ruby" -#define RUBY_SITE_ARCHLIB "/usr/local/lib/ruby/1.4/site_ruby/i386-mswin32" +#define RUBY_SITE_LIB "/usr/local/lib/ruby/site_ruby" +#define RUBY_SITE_LIB2 "/usr/local/lib/ruby/site_ruby/1.4" #define RUBY_PLATFORM "i386-mswin32" +#define RUBY_ARCHLIB "/usr/local/lib/ruby/1.4/i386-mswin32" +#define RUBY_SITE_ARCHLIB "/usr/local/lib/ruby/site_ruby/1.4/i386-mswin32" #define SIZEOF_INT 4 #define SIZEOF_SHORT 2 diff --git a/win32/config.status b/win32/config.status index 6f77f19b01..36ffc99949 100644 --- a/win32/config.status +++ b/win32/config.status @@ -5,7 +5,7 @@ s%@CPPFLAGS@%%g s%@CXXFLAGS@%%g s%@FFLAGS@%%g s%@DEFS@% - -DUSE_THREAD -DSIZEOF_INT=4 -DSIZEOF_SHORT=2 -DSIZEOF_LONG=4 -DSIZEOF_VOIDP=4 -DSIZEOF_FLOAT=4 -DSIZEOF_DOUBLE=8 -DHAVE_PROTOTYPES=1 -DHAVE_STDARG_PROTOTYPES=1 -DHAVE_STDLIB_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_ST_RDEV=1 -DGETGROUPS_T=int -DRETSIGTYPE=void -DHAVE_ALLOCA=1 -DHAVE_FMOD=1 -DHAVE_WAITPID=1 -DHAVE_GETCWD=1 -DHAVE_CHSIZE=1 -DHAVE_GETGROUPS=1 -DHAVE_GETLOGIN=1 -DRSHIFT=\(x,y\)\ \(\(x\)\>\>y\) -DFILE_COUNT=_cnt -DDLEXT=\".dll\" -DRUBY_LIB=\"/usr/local/lib/ruby/1.4\" -DRUBY_ARCHLIB=\"/usr/local/lib/ruby/1.4/i386-mswin32\" -DRUBY_PLATFORM=\"i386-mswin32\" %g + -DUSE_THREAD -DSIZEOF_INT=4 -DSIZEOF_SHORT=2 -DSIZEOF_LONG=4 -DSIZEOF_VOIDP=4 -DSIZEOF_FLOAT=4 -DSIZEOF_DOUBLE=8 -DHAVE_PROTOTYPES=1 -DHAVE_STDARG_PROTOTYPES=1 -DHAVE_STDLIB_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_ST_RDEV=1 -DGETGROUPS_T=int -DRETSIGTYPE=void -DHAVE_ALLOCA=1 -DHAVE_FMOD=1 -DHAVE_WAITPID=1 -DHAVE_GETCWD=1 -DHAVE_CHSIZE=1 -DHAVE_GETGROUPS=1 -DHAVE_GETLOGIN=1 -DRSHIFT=\(x,y\)\ \(\(x\)\>\>y\) -DFILE_COUNT=_cnt -DDLEXT=\".dll\" -DRUBY_PLATFORM=\"i386-mswin32\" %g s%@LDFLAGS@%%g s%@LIBS@%user32.lib advapi32.lib wsock32.lib%g s%@exec_prefix@%${prefix}%g |