From c3a17c71a45207dd715d537704f161de9219f0d7 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 4 Sep 2010 18:49:22 -0700
Subject: [PATCH 1/1] altosui: Fix linux fat distribution

Again, use 'cp -p' instead of 'cp -a' to get files into the archive
instead of links. Also, make the shell script 'altosui' instead of
'altosui-fat'.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 ao-tools/altosui/Makefile.am | 9 ++++++---
 ao-tools/altosui/altosui-fat | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 65a3cf9a..bc8dbc0d 100644
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -78,7 +78,8 @@ WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
 
 FAT_FILES=$(FATJAR) $(FREETTS_CLASS)
 
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) altosui-fat
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
+LINUX_EXTRA=altosui-fat
 
 MACOSX_FILES=$(FAT_FILES) libaltos.dylib
 MACOSX_EXTRA=$(FIRMWARE)
@@ -144,11 +145,13 @@ $(FREETTS_CLASS):
 	-rm -f "$@"
 	$(LN_S) "$(FREETTS)"/"$@" .
 
-$(LINUX_DIST): $(LINUX_FILES)
+$(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)
 	-rm -f $@
 	-rm -rf linux
 	mkdir -p linux/AltOS
-	cp -a $(LINUX_FILES) linux/AltOS
+	cp -p $(LINUX_FILES) linux/AltOS
+	cp -p altosui-fat linux/AltOS/altosui
+	chmod +x linux/AltOS/altosui
 	tar cjf $@ -C linux AltOS
 
 $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
diff --git a/ao-tools/altosui/altosui-fat b/ao-tools/altosui/altosui-fat
index a95b78b8..9e5a8f15 100755
--- a/ao-tools/altosui/altosui-fat
+++ b/ao-tools/altosui/altosui-fat
@@ -1,4 +1,4 @@
 #!/bin/sh
 me=`which "$0"`
 dir=`dirname "$me"`
-exec java -cp "$dir/*" -Djava.library.path="$dir" -jar "$dir"/altosui.jar
+exec java -cp "$dir/*" -Djava.library.path="$dir" -jar "$dir"/altosui-fat.jar
-- 
2.30.2