Merge branch 'master' into branch-1.9

[fw/altos] / map-server / altos-mapd / Makefile.am

diff --git a/map-server/altos-mapd/Makefile.am b/map-server/altos-mapd/Makefile.am
index bb20dd845886ec795c4234006890f2351748b41a..29ee65e85fcc5a07869f93c3f7e20a4cdec04811 100644 (file)
--- a/map-server/altos-mapd/Makefile.am
+++ b/map-server/altos-mapd/Makefile.am
@@ -26,7 +26,7 @@ defaultsdir=$(sysconfdir)/default
 
 defaults_DATA=altos-mapd-default
 
-systemddir=$(libdir)/systemd/system
+systemddir=$(bindir)/../lib/systemd/system
 
 systemd_DATA=altos-mapd.service
 
@@ -60,6 +60,10 @@ altos-mapd: Makefile
        echo 'exec java -Djava.library.path="$(altoslibdir)" -jar "$(altosmapddir)/altosmapd.jar" "$$@"' >> $@
        chmod +x $@
 
+Manifest.txt: Makefile
+       echo 'Main-Class: altosmapd.AltosMapd' > $@
+       echo "Class-Path: $(ALTOSLIB_CLASS) $(ALTOSUILIB_CLASS)" >> $@
+
 altos-mapd-test: Makefile
        echo '#!/bin/sh' > $@
        echo 'dir="$$(dirname $$0)"' >> $@
@@ -77,3 +81,6 @@ $(ALTOSLIB_CLASS):
        -rm -f "$@"
        $(LN_S) ../../altoslib/"$@" .
 
+
+clean::
+       rm -f Manifest.txt