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>

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 65a3cf9aafe2ca77260e03428e48147027541937..bc8dbc0dd0c5de4773f488ef5650286ca49b76b9 100644 (file)
--- 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)
 
 
 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)
 
 MACOSX_FILES=$(FAT_FILES) libaltos.dylib
 MACOSX_EXTRA=$(FIRMWARE)


@@ -144,11 +145,13 @@ $(FREETTS_CLASS):
        -rm -f "$@"
        $(LN_S) "$(FREETTS)"/"$@" .
 
        -rm -f "$@"
        $(LN_S) "$(FREETTS)"/"$@" .
 

-$(LINUX_DIST): $(LINUX_FILES)
+$(LINUX_DIST): $(LINUX_FILES) $(LINUX_EXTRA)

        -rm -f $@
        -rm -rf linux
        mkdir -p linux/AltOS
        -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)
        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 a95b78b871678ad62f597496ca40510b491b1520..9e5a8f15dde7902398726bb04c199972c5669603 100755 (executable)
--- a/ao-tools/altosui/altosui-fat
+++ b/ao-tools/altosui/altosui-fat
@@ -1,4 +1,4 @@
 #!/bin/sh
 me=`which "$0"`
 dir=`dirname "$me"`
 #!/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