summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-26 15:30:50 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-01-26 15:30:50 +0000
commitf83138087ff95630e55171979377cc5ffa609c6e (patch)
tree02d0fa70f60049b9f0e9ceffc250556680b6e838
parent51de9a847f0d7b652e96183995410fa0c5e5f3cc (diff)
downloadruby-f83138087ff95630e55171979377cc5ffa609c6e.tar.gz
ruby-f83138087ff95630e55171979377cc5ffa609c6e.tar.xz
ruby-f83138087ff95630e55171979377cc5ffa609c6e.zip
* win32/Makefile.sub: rollback.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/Makefile.sub5
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d04bb9a0..d99209080 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 27 00:30:11 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/Makefile.sub: rollback.
+
Mon Jan 26 22:53:04 2004 Dave Thomas <dave@pragprog.com>
* io.c: Remove documentation references to $defout.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 0315b9777..dcd4abb9e 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -81,6 +81,9 @@ prefix = /usr
!if !defined(exec_prefix)
exec_prefix = $(prefix)
!endif
+!if !defined(DESTDIR)
+DESTDIR = $(prefix)
+!endif
!if !defined(libdir)
libdir = $(exec_prefix)/lib
!endif
@@ -302,7 +305,7 @@ s,@FFLAGS@,$(FFLAGS),;t t
s,@LDFLAGS@,,;t t
s,@LIBS@,$(LIBS),;t t
s,@exec_prefix@,$${prefix},;t t
-s,@prefix@,$(prefix),;t t
+s,@prefix@,,;t t
s,@program_transform_name@,s,,,,;t t
s,@bindir@,$${exec_prefix}/bin,;t t
s,@sbindir@,$${exec_prefix}/sbin,;t t