altosuilib: Fix install issues on Linux

altosuilib.jar wasn't getting installed
micropeak was using the wrong name

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am
index d4aa011693b31a54d8d21e8740480d8d3d768fb4..da5fb848225d822925b2b7d5785ce32580cee663 100644 (file)
--- a/altosuilib/Makefile.am
+++ b/altosuilib/Makefile.am
@@ -30,11 +30,11 @@ all-local: $(JAR)
 clean-local:
        -rm -rf $(JAVAROOT) $(JAR)
 
 clean-local:
        -rm -rf $(JAVAROOT) $(JAR)
 

-install-altosuilibjava: $(JAR)
+install-altosuilibJAVA: $(JAR)

        @$(NORMAL_INSTALL)
        test -z "$(altosuilibdir)" || $(MKDIR_P) "$(DESTDIR)$(altosuilibdir)"
        @$(NORMAL_INSTALL)
        test -z "$(altosuilibdir)" || $(MKDIR_P) "$(DESTDIR)$(altosuilibdir)"

-       echo " $(INSTALL_DATA)" "$<" "'$(DESTDIR)$(altosuilibdir)/$(JAR)"; \
-       $(INSTALL_DATA) "$<" "$(DESTDIR)$(altosuilibdir)"
+       echo " $(INSTALL_DATA)" "$(JAR)" "'$(DESTDIR)$(altosuilibdir)/$(JAR)"; \
+       $(INSTALL_DATA) "$(JAR)" "$(DESTDIR)$(altosuilibdir)"

 
 $(JAVAROOT):
        mkdir -p $(JAVAROOT)
 
 $(JAVAROOT):
        mkdir -p $(JAVAROOT)

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 89ff2fb3d22fe07748c0f8ef9ea0d6f488bc7274..c452db972bf651eaed72f4d2709d5853320de279 100644 (file)
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -44,7 +44,7 @@ ALTOSLIB_CLASS=\
        AltosLib.jar
 
 ALTOSUILIB_CLASS=\
        AltosLib.jar
 
 ALTOSUILIB_CLASS=\

-       AltosUILib.jar
+       altosuilib.jar

 
 # Icons
 ICONDIR=$(top_srcdir)/icon
 
 # Icons
 ICONDIR=$(top_srcdir)/icon


@@ -221,9 +221,9 @@ $(WINDOWS_DIST): $(WINDOWS_FILES) micropeak-windows.nsi
 
 Manifest.txt: Makefile
        echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@
 
 Manifest.txt: Makefile
        echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@

-       echo "Class-Path: AltosLib.jar AltosUILib.jar $(JCOMMON)/jcommon.jar $(JFREECHART)/jfreechart.jar" >> $@
+       echo "Class-Path: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) $(JCOMMON)/jcommon.jar $(JFREECHART)/jfreechart.jar" >> $@

 
 Manifest-fat.txt:
        echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@
 
 Manifest-fat.txt:
        echo 'Main-Class: org.altusmetrum.micropeak.MicroPeak' > $@

-       echo "Class-Path: AltosLib.jar AltosUILib.jar jcommon.jar jfreechart.jar" >> $@
+       echo "Class-Path: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) jcommon.jar jfreechart.jar" >> $@