[MLton-commit] r7369

Matthew Fluet fluet at mlton.org
Wed Dec 2 14:04:43 PST 2009


GNU patch 2.6 behaves differently(?!).
----------------------------------------------------------------------

U   mlton/trunk/lib/ckit-lib/Makefile
U   mlton/trunk/lib/mlrisc-lib/Makefile
U   mlton/trunk/lib/smlnj-lib/Makefile

----------------------------------------------------------------------

Modified: mlton/trunk/lib/ckit-lib/Makefile
===================================================================
--- mlton/trunk/lib/ckit-lib/Makefile	2009-12-02 22:04:33 UTC (rev 7368)
+++ mlton/trunk/lib/ckit-lib/Makefile	2009-12-02 22:04:39 UTC (rev 7369)
@@ -1,4 +1,5 @@
-## Copyright (C) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh
+## Copyright (C) 2009 Matthew Fluet.
+ # Copyright (C) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh
  #    Jagannathan, and Stephen Weeks.
  # Copyright (C) 1997-2000 NEC Research Institute.
  #
@@ -14,7 +15,7 @@
 	chmod -R a+r ckit
 	chmod -R g-s ckit
 	chmod a-x ckit/src/ast/simplify-assign-ops.sml
-	patch -s -p0 < ckit.patch
+	patch -s -d ckit -p1 < ckit.patch
 
 .PHONY: clean
 clean:

Modified: mlton/trunk/lib/mlrisc-lib/Makefile
===================================================================
--- mlton/trunk/lib/mlrisc-lib/Makefile	2009-12-02 22:04:33 UTC (rev 7368)
+++ mlton/trunk/lib/mlrisc-lib/Makefile	2009-12-02 22:04:39 UTC (rev 7369)
@@ -1,4 +1,5 @@
-## Copyright (C) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh
+## Copyright (C) 2009 Matthew Fluet.
+ # Copyright (C) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh
  #    Jagannathan, and Stephen Weeks.
  # Copyright (C) 1997-2000 NEC Research Institute.
  #
@@ -13,7 +14,7 @@
 	gzip -dc MLRISC.tgz | tar xf -
 	chmod -R a+r MLRISC
 	chmod -R g-s MLRISC
-	patch -s -p0 < MLRISC.patch
+	patch -s -d MLRISC -p1 < MLRISC.patch
 
 .PHONY: clean
 clean:

Modified: mlton/trunk/lib/smlnj-lib/Makefile
===================================================================
--- mlton/trunk/lib/smlnj-lib/Makefile	2009-12-02 22:04:33 UTC (rev 7368)
+++ mlton/trunk/lib/smlnj-lib/Makefile	2009-12-02 22:04:39 UTC (rev 7369)
@@ -1,4 +1,5 @@
-## Copyright (C) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh
+## Copyright (C) 2009 Matthew Fluet.
+ # Copyright (C) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh
  #    Jagannathan, and Stephen Weeks.
  # Copyright (C) 1997-2000 NEC Research Institute.
  #
@@ -14,7 +15,7 @@
 	chmod -R a+r smlnj-lib
 	chmod -R g-s smlnj-lib
 	rm -f smlnj-lib/HTML/.cvsignore
-	patch -s -p0 < smlnj-lib.patch
+	patch -s -d smlnj-lib -p1 < smlnj-lib.patch
 	mv smlnj-lib/LICENSE ../../doc/license/SMLNJ-LIB-LICENSE
 
 .PHONY: clean




More information about the MLton-commit mailing list