From b79586135b8de7c2dd6d5254088807dcf9ec9afb Mon Sep 17 00:00:00 2001
From: ryoon <ryoon>
Date: Sun, 29 Sep 2013 08:34:02 +0000
Subject: Fix install stage error observed on SmartOS.

---
 cross/freemint-mintbin/distinfo                      | 4 ++--
 cross/freemint-mintbin/patches/patch-src_Makefile.in | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'cross/freemint-mintbin')

diff --git a/cross/freemint-mintbin/distinfo b/cross/freemint-mintbin/distinfo
index a7838cf163e..212250c74c5 100644
--- a/cross/freemint-mintbin/distinfo
+++ b/cross/freemint-mintbin/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2013/09/16 04:47:42 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2013/09/29 08:34:02 ryoon Exp $
 
 SHA1 (mintbin-CVS-20110527.tar.gz) = ab929bd1c090032911df13786c007bfe0c9ff476
 RMD160 (mintbin-CVS-20110527.tar.gz) = ea6f66337ff3a3ae6c26044fadc3665616eb6b5f
 Size (mintbin-CVS-20110527.tar.gz) = 327834 bytes
 SHA1 (patch-po_Makefile.in.in) = 504f50746708d1da4f446d135e634959f69fc931
-SHA1 (patch-src_Makefile.in) = fb61b0edfdc42e5e0b6e3d8f79f87dcc3ed1a8c4
+SHA1 (patch-src_Makefile.in) = 59be759e4194f9b4a0147c1d3cee8f18de834fa9
diff --git a/cross/freemint-mintbin/patches/patch-src_Makefile.in b/cross/freemint-mintbin/patches/patch-src_Makefile.in
index f19c4e10abf..4f5b8d71d9d 100644
--- a/cross/freemint-mintbin/patches/patch-src_Makefile.in
+++ b/cross/freemint-mintbin/patches/patch-src_Makefile.in
@@ -1,14 +1,17 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2013/09/16 04:47:43 ryoon Exp $
+$NetBSD: patch-src_Makefile.in,v 1.2 2013/09/29 08:34:02 ryoon Exp $
 
 * Do not create hardlinks for m68k-atari-mint-*.
+* Avoid "syntax error near unexpected token `||'" error, and fix install
 
 --- src/Makefile.in.orig	2011-05-27 17:41:39.000000000 +0000
 +++ src/Makefile.in
-@@ -420,7 +420,6 @@ install-exec-local:
+@@ -419,8 +419,7 @@ install-exec-local:
+ 	if test x$(DESTDIR)$(nativebindir) != x; then \
  	  $(mkinstalldirs) $(DESTDIR)$(nativebindir) || exit 1; \
  	  for prog in $(bin_PROGRAMS); do \
- 	    iprog=`echo $$prog | sed '$(transform)'`; \
+-	    iprog=`echo $$prog | sed '$(transform)'`; \
 -            ln $(DESTDIR)$(bindir)/$$iprog $(DESTDIR)$(nativebindir)/$$iprog >/dev/null 2>/dev/null \
++	    { iprog=`echo $$prog | sed '$(transform)'`; } \
  	      || $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(nativebindir)/$$iprog ; \
  	  done; \
          fi
-- 
cgit v1.2.3