[前][次][番号順一覧][スレッド一覧]

ruby-changes:23063

From: naruse <ko1@a...>
Date: Fri, 23 Mar 2012 07:52:14 +0900 (JST)
Subject: [ruby-changes:23063] naruse:r35113 (trunk): Revert "* configure.in (Makefile): get rid of confliction with -j."

naruse	2012-03-23 07:52:05 +0900 (Fri, 23 Mar 2012)

  New Revision: 35113

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35113

  Log:
    Revert "* configure.in (Makefile): get rid of confliction with -j."
    
    This reverts commit r35104 because it breaks build on FreeBSD.

  Modified files:
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 35112)
+++ configure.in	(revision 35113)
@@ -3075,10 +3075,12 @@
 	else
 	    echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
 	fi
+    } > confmk$$.tmp && mv -f confmk$$.tmp Makefile &&
+    {
 	grep '^ruby:' Makefile > /dev/null ||
 	${MAKE-make} info-program | grep '^PROGRAM=ruby$' > /dev/null ||
-	echo 'ruby: $(PROGRAM);'
-    } > confmk$$.tmp && mv -f confmk$$.tmp Makefile],
+	echo 'ruby: $(PROGRAM);' >> Makefile
+    }],
 [EXEEXT='$EXEEXT' gnumake='$gnumake'])
 
 AC_ARG_WITH([ruby-pc],

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]