summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-09-05 02:05:06 -0700
committerKeith Packard <keithp@keithp.com>2010-09-05 02:05:06 -0700
commit3d49d5f69b41c27003dbc5ccf1899014bd13bd99 (patch)
tree3fa313271f3c3e42ca9cc76f8cca1937067ee907
parentb61fec225ada6a9e252e4c7920101ee18c77cbdc (diff)
altosui: ensure that 'altosui' script is installed. Pass arguments along.
Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--ao-tools/altosui/Makefile.am6
-rwxr-xr-xao-tools/altosui/altosui-fat2
2 files changed, 5 insertions, 3 deletions
diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 98482823..dd4b31e6 100644
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -3,6 +3,8 @@ AM_JAVACFLAGS=-encoding UTF-8
CLASSPATH_ENV=CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*"
+bin_SCRIPTS=altosui
+
altosui_JAVA = \
AltosChannelMenu.java \
AltosConfig.java \
@@ -129,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):
diff --git a/ao-tools/altosui/altosui-fat b/ao-tools/altosui/altosui-fat
index 9e5a8f15..95b1c051 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-fat.jar
+exec java -cp "$dir/*" -Djava.library.path="$dir" -jar "$dir"/altosui-fat.jar "$@"