X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FMakefile.am;h=984828238ab956fdf3662af71e239ca5c3da3229;hb=b61fec225ada6a9e252e4c7920101ee18c77cbdc;hp=13bceae26892338a33cb9b4949d323bd0aea230e;hpb=044fd27449c70474f51b99dec25fd23d3c03a559;p=fw%2Faltos

diff --git a/ao-tools/altosui/Makefile.am b/ao-tools/altosui/Makefile.am
index 13bceae2..98482823 100644
--- a/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@ -1,7 +1,7 @@
 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/*"
 
 altosui_JAVA = \
 	AltosChannelMenu.java \
@@ -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)
@@ -157,8 +160,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