altosui: Fix linux fat distribution
authorKeith Packard <keithp@keithp.com>
Sun, 5 Sep 2010 01:49:22 +0000 (18:49 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 5 Sep 2010 01:49:22 +0000 (18:49 -0700)
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
ao-tools/altosui/altosui-fat

index 65a3cf9..bc8dbc0 100644 (file)
@@ -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)
index a95b78b..9e5a8f1 100755 (executable)
@@ -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