summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-08 02:37:43 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-08 02:37:43 +0000
commit8439cf7c772d3f69bcef65d87c75205ab5cf5edd (patch)
tree9aacb31384234ec64a58aef391fd4d0994dd46a7
parent355c6b616c47314ffab09f8c6421670b96dac3fb (diff)
* Makefile.in, common.mk, configure.in: fix for platforms without
rm. patches from Yutaka kanemoto <kinpoco at gmail.com>. [ruby-dev:29215] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in1
-rw-r--r--common.mk3
-rw-r--r--configure.in4
4 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index effde73..e3288b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 8 11:32:54 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * Makefile.in, common.mk, configure.in: fix for platforms without
+ rm. patches from Yutaka kanemoto <kinpoco at gmail.com>.
+ [ruby-dev:29215]
+
Mon Aug 7 17:56:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
diff --git a/Makefile.in b/Makefile.in
index 2b050bf..254f165 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,6 +85,7 @@ ASFLAGS = @ASFLAGS@
OBJEXT = @OBJEXT@
MANTYPE = @MANTYPE@
+PREINSTALL = @PREINSTALL@
#### End of variables
all:
diff --git a/common.mk b/common.mk
index dfc0e98..cf3e959 100644
--- a/common.mk
+++ b/common.mk
@@ -112,8 +112,7 @@ do-install-doc: $(PROGRAM)
pre-install: pre-install-local pre-install-ext
pre-install-local:: PHONY
- $(RM) $(prefix)/lib/$(LIBRUBY)
- $(RM) -r $(prefix)/lib/ruby/$(MAJOR).$(MINOR)/$(arch)
+ $(PREINSTALL)
pre-install-ext:: PHONY
pre-install-doc:: PHONY
diff --git a/configure.in b/configure.in
index 7fc0a03..8ee5e6d 100644
--- a/configure.in
+++ b/configure.in
@@ -1449,6 +1449,9 @@ case "$target_os" in
esac
MINIOBJS=dmydln.o
;;
+ aix*)
+ PREINSTALL='@$(RM) -r $(prefix)/lib/$(LIBRUBY_A) $(prefix)/lib/$(LIBRUBY_SO) $(prefix)/lib/ruby/$(MAJOR).$(MINOR)/$(arch)'
+ ;;
*)
;;
esac
@@ -1481,6 +1484,7 @@ AC_SUBST(COMMON_MACROS)
AC_SUBST(COMMON_HEADERS)
AC_SUBST(EXPORT_PREFIX)
AC_SUBST(MINIOBJS)
+AC_SUBST(PREINSTALL)
MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
MAKEFILES="`echo $MAKEFILES`"