altosui: ensure that 'altosui' script is installed. Pass arguments along.

[fw/altos] / ao-tools / altosui / Makefile.am

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 13bceae26892338a33cb9b4949d323bd0aea230e..dd4b31e64778c9ddb49e03da97eca941c70d9ed6 100644 (file)
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -1,7 +1,9 @@
 JAVAROOT=classes
 AM_JAVACFLAGS=-encoding UTF-8
 
-CLASSPATH_ENV=CLASSPATH="classes/altosui/*:../libaltos/libaltosJNI/*:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
+
+bin_SCRIPTS=altosui
 
 altosui_JAVA = \
        AltosChannelMenu.java \
@@ -78,7 +80,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)
@@ -128,12 +131,12 @@ Manifest-fat.txt:
 
 altosui: Makefile
        echo "#!/bin/sh" > $@
-       echo 'exec java  -cp "$(FREETTS)/*" -Djava.library.path="$(libdir)" -jar "$(altosuidir)/altosui.jar"' >> $@
+       echo 'exec java  -cp "$(FREETTS)/*" -Djava.library.path="$(libdir)" -jar "$(altosuidir)/altosui.jar" "$$@"' >> $@
        chmod +x $@
 
 altosui-test: Makefile
        echo "#!/bin/sh" > $@
-       echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos" -jar altosui.jar' >> $@
+       echo 'exec java -cp "$(FREETTS)/*" -Djava.library.path="../libaltos" -jar altosui.jar "$$*"' >> $@
        chmod +x $@
 
 $(LIBALTOS):
@@ -144,11 +147,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)
@@ -157,8 +162,9 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
        mkdir macosx
        cp -a AltosUI.app macosx/
        mkdir -p macosx/AltOS macosx/AltosUI.app/Contents/Resources/Java
-       cp -a $(MACOSX_FILES) macosx/AltosUI.app/Contents/Resources/Java
-       cp -a $(MACOSX_EXTRA) macosx/AltOS
+       cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
+       cp -p $(FREETTS_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
+       cp -p $(MACOSX_EXTRA) macosx/AltOS
        cd macosx && zip -r ../$@ AltosUI.app AltOS
 
 $(WINDOWS_DIST): $(WINDOWS_FILES) altos-windows.nsi