Skip to content

Commit

Permalink
* Makefile.in, common.mk, configure.in: fix for platforms without
Browse files Browse the repository at this point in the history
  rm. patches from Yutaka kanemoto <kinpoco at gmail.com>.
  [ruby-dev:29215]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
unak committed Aug 8, 2006
1 parent 09abd57 commit 45c1683
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
6 changes: 6 additions & 0 deletions 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,
Expand Down
1 change: 1 addition & 0 deletions Makefile.in
Expand Up @@ -85,6 +85,7 @@ ASFLAGS = @ASFLAGS@
OBJEXT = @OBJEXT@
MANTYPE = @MANTYPE@

PREINSTALL = @PREINSTALL@
#### End of variables

all:
Expand Down
3 changes: 1 addition & 2 deletions common.mk
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions configure.in
Expand Up @@ -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
Expand Down Expand Up @@ -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`"
Expand Down

0 comments on commit 45c1683

Please sign in to comment.