From 61f96a524df6552afac1d7afbeff7fcd30619323 Mon Sep 17 00:00:00 2001
From: Andrea Mazzoleni <amadvance@gmail.com>
Date: Tue, 14 Nov 2017 22:44:01 +0100
Subject: [PATCH] Use new tools for unix2dos conversion

---
 advance/cab.mak  |  2 +-
 advance/emu.mak  | 10 +++++-----
 advance/menu.mak |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/advance/cab.mak b/advance/cab.mak
index 6b0afd127..f21587d44 100644
--- a/advance/cab.mak
+++ b/advance/cab.mak
@@ -237,6 +237,6 @@ ifeq ($(CONF_SYSTEM),dos)
 	cp -r $(CAB_CONTRIB_SRC) $(CAB_DIST_DIR_BIN)/contrib
 endif
 	rm -f $(CAB_DIST_FILE_BIN).zip
-	find $(CAB_DIST_DIR_BIN) \( -name "*.txt" \) -type f -exec utod {} \;
+	find $(CAB_DIST_DIR_BIN) \( -name "*.txt" \) -type f -exec unix2dos {} \;
 	cd $(CAB_DIST_DIR_BIN) && zip -r ../$(CAB_DIST_FILE_BIN).zip *
 	rm -r $(CAB_DIST_DIR_BIN)
diff --git a/advance/emu.mak b/advance/emu.mak
index 93ed9965e..085fd7bc2 100644
--- a/advance/emu.mak
+++ b/advance/emu.mak
@@ -1143,7 +1143,7 @@ endif
 	cp -R $(srcdir)/src $(EMU_DIST_DIR_SRC)
 	cp -R $(srcdir)/srcmess $(EMU_DIST_DIR_SRC)
 	cp -R $(srcdir)/mess $(EMU_DIST_DIR_SRC)
-	find $(EMU_DIST_DIR_SRC) \( -name "*.dat" \) -type f -exec dtou {} \;
+	find $(EMU_DIST_DIR_SRC) \( -name "*.dat" \) -type f -exec dos2unix {} \;
 	rm -f $(EMU_DIST_FILE_SRC).tar.gz
 	tar cfzo $(EMU_DIST_FILE_SRC).tar.gz $(EMU_DIST_DIR_SRC)
 	rm -r $(EMU_DIST_DIR_SRC)
@@ -1171,13 +1171,13 @@ endif
 	mkdir $(EMU_DIST_DIR_BIN)/contrib
 	cp -R $(EMU_CONTRIB_SRC) $(EMU_DIST_DIR_BIN)/contrib
 ifeq ($(CONF_SYSTEM),unix)
-	find $(EMU_DIST_DIR_BIN) \( -name "*.dat" \) -type f -exec dtou {} \;
+	find $(EMU_DIST_DIR_BIN) \( -name "*.dat" \) -type f -exec dos2unix {} \;
 	rm -f $(EMU_DIST_FILE_BIN).tar.gz
 	tar cfzo $(EMU_DIST_FILE_BIN).tar.gz $(EMU_DIST_DIR_BIN)
 else
-	find $(EMU_DIST_DIR_BIN) \( -name "*.txt" \) -type f -exec utod {} \;
-	find $(EMU_DIST_DIR_BIN) \( -name "*.bat" \) -type f -exec utod {} \;
-	find $(EMU_DIST_DIR_BIN) \( -name "*.dat" \) -type f -exec utod {} \;
+	find $(EMU_DIST_DIR_BIN) \( -name "*.txt" \) -type f -exec unix2dos {} \;
+	find $(EMU_DIST_DIR_BIN) \( -name "*.bat" \) -type f -exec unix2dos {} \;
+	find $(EMU_DIST_DIR_BIN) \( -name "*.dat" \) -type f -exec unix2dos {} \;
 	rm -f $(EMU_DIST_FILE_BIN).zip
 	cd $(EMU_DIST_DIR_BIN) && zip -r ../$(EMU_DIST_FILE_BIN).zip *
 endif
diff --git a/advance/menu.mak b/advance/menu.mak
index 8b6f7fc6b..7bdb295d0 100644
--- a/advance/menu.mak
+++ b/advance/menu.mak
@@ -729,7 +729,7 @@ ifeq ($(CONF_SYSTEM),unix)
 	tar cfzo $(MENU_DIST_FILE_BIN).tar.gz $(MENU_DIST_DIR_BIN)
 else
 	rm -f $(MENU_DIST_FILE_BIN).zip
-	find $(MENU_DIST_DIR_BIN) \( -name "*.txt" \) -type f -exec utod {} \;
+	find $(MENU_DIST_DIR_BIN) \( -name "*.txt" \) -type f -exec unix2dos {} \;
 	cd $(MENU_DIST_DIR_BIN) && zip -r ../$(MENU_DIST_FILE_BIN).zip *
 endif
 	rm -r $(MENU_DIST_DIR_BIN)