diff options
| author | Keith Packard <keithp@keithp.com> | 2013-01-02 16:07:49 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-01-02 16:07:49 -0800 |
| commit | 1979063928f1cdfc75c01ec098164c2822a5138d (patch) | |
| tree | c8bdced87282220db61807492725d9556a426bc9 | |
| parent | 31fa139578a86821844e3e2efb1a84bdea4f1370 (diff) | |
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>
| -rw-r--r-- | altosuilib/Makefile.am | 6 | ||||
| -rw-r--r-- | micropeak/Makefile.am | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am index d4aa0116..da5fb848 100644 --- a/altosuilib/Makefile.am +++ b/altosuilib/Makefile.am @@ -30,11 +30,11 @@ all-local: $(JAR) clean-local: -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)" + echo " $(INSTALL_DATA)" "$(JAR)" "'$(DESTDIR)$(altosuilibdir)/$(JAR)"; \ + $(INSTALL_DATA) "$(JAR)" "$(DESTDIR)$(altosuilibdir)" $(JAVAROOT): mkdir -p $(JAVAROOT) diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am index 89ff2fb3..c452db97 100644 --- a/micropeak/Makefile.am +++ b/micropeak/Makefile.am @@ -44,7 +44,7 @@ ALTOSLIB_CLASS=\ AltosLib.jar ALTOSUILIB_CLASS=\ - AltosUILib.jar + altosuilib.jar # 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' > $@ - 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' > $@ - echo "Class-Path: AltosLib.jar AltosUILib.jar jcommon.jar jfreechart.jar" >> $@ + echo "Class-Path: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS) jcommon.jar jfreechart.jar" >> $@ |