X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FMakefile.am;h=d4aa011693b31a54d8d21e8740480d8d3d768fb4;hb=5ce43661834920c3a8f3a1b6e1c555fb952b512d;hp=d93d941519b7963ee52ae0bd5ae4c0e6548c1e5b;hpb=8a5666bcf4949b846589c000e1620afe39593f57;p=fw%2Faltos

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index d93d9415..d4aa0116 100644
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -2,14 +2,13 @@ AM_JAVACFLAGS=-encoding UTF-8 -Xlint:deprecation
 
 JAVAROOT=bin
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="bin:../altoslib/*:../libaltos:$(FREETTS)/*:/usr/share/java/*"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):../altoslib/*:../libaltos:/usr/share/java/*"
 
 SRC=.
-BIN=bin/org/altusmetrum/AltosUILib
 
-AltosUILibdir = $(datadir)/java
+altosuilibdir = $(datadir)/java
 
-AltosUILib_JAVA = \
+altosuilib_JAVA = \
 	AltosUIConfigure.java \
 	AltosDevice.java \
 	AltosDeviceDialog.java \
@@ -24,21 +23,21 @@ AltosUILib_JAVA = \
 	AltosUIVersion.java \
 	AltosUnitsListener.java
 
-JAR=AltosUILib.jar
+JAR=altosuilib.jar
 
 all-local: $(JAR)
 
 clean-local:
-	-rm -rf bin $(JAR)
+	-rm -rf $(JAVAROOT) $(JAR)
 
-install-AltosUILibJAVA: $(JAR)
+install-altosuilibjava: $(JAR)
 	@$(NORMAL_INSTALL)
-	test -z "$(AltosUILibdir)" || $(MKDIR_P) "$(DESTDIR)$(AltosUILibdir)"
-	echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(AltosUILibdir)/$(JAR)"; \
-	$(INSTALL_DATA) "$<" "$(DESTDIR)$(AltosUILibdir)"
+	test -z "$(altosuilibdir)" || $(MKDIR_P) "$(DESTDIR)$(altosuilibdir)"
+	echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuilibdir)/$(JAR)"; \
+	$(INSTALL_DATA) "$<" "$(DESTDIR)$(altosuilibdir)"
 
-bin:
-	mkdir -p bin
+$(JAVAROOT):
+	mkdir -p $(JAVAROOT)
 
-$(JAR): classAltosUILib.stamp
-	jar cf $@ -C bin org
+$(JAR): classaltosuilib.stamp
+	jar cf $@ -C $(JAVAROOT) .