projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos-mapd: Install systemd dir in arch-independent location
[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 a3fd196ecfd036c27607e7a59804d858aa5c9004..29ee65e85fcc5a07869f93c3f7e20a4cdec04811 100644
(file)
--- a/
map-server/altos-mapd/Makefile.am
+++ b/
map-server/altos-mapd/Makefile.am
@@
-1,5
+1,5
@@
JAVAROOT=classes
JAVAROOT=classes
-AM_JAVACFLAGS=
-target 1.6 -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked -source 6
+AM_JAVACFLAGS=
$(JAVAC_VERSION_FLAGS) -encoding UTF-8 -Xlint:deprecation -Xlint:unchecked
altoslibdir=$(libdir)/altos
altoslibdir=$(libdir)/altos
@@
-22,6
+22,14
@@
FATJAR=altosmapd-fat.jar
all-local: classes/altosmapd $(JAR) altos-mapd altos-mapd-test altos-mapd-jdb
all-local: classes/altosmapd $(JAR) altos-mapd altos-mapd-test altos-mapd-jdb
+defaultsdir=$(sysconfdir)/default
+
+defaults_DATA=altos-mapd-default
+
+systemddir=$(bindir)/../lib/systemd/system
+
+systemd_DATA=altos-mapd.service
+
install-altosmapdJAVA: altosmapd.jar
@$(NORMAL_INSTALL)
test -z "$(altosmapddir)" || $(MKDIR_P) "$(DESTDIR)$(altosmapddir)"
install-altosmapdJAVA: altosmapd.jar
@$(NORMAL_INSTALL)
test -z "$(altosmapddir)" || $(MKDIR_P) "$(DESTDIR)$(altosmapddir)"
@@
-34,18
+42,28
@@
classes/altosmapd:
$(JAR): classaltosmapd.stamp Manifest.txt $(ALTOSLIB_CLASS)
jar cfm $@ Manifest.txt \
-C classes altosmapd
$(JAR): classaltosmapd.stamp Manifest.txt $(ALTOSLIB_CLASS)
jar cfm $@ Manifest.txt \
-C classes altosmapd
+if STRIP_NONDETERMINISM
+ $(STRIP_NONDETERMINISM) $@
+endif
altosmapddir=$(datadir)/java
$(FATJAR): classaltosmapd.stamp Manifest-fat.txt $(ALTOSLIB_CLASS)
jar cfm $@ Manifest-fat.txt \
-C classes altosmapd
altosmapddir=$(datadir)/java
$(FATJAR): classaltosmapd.stamp Manifest-fat.txt $(ALTOSLIB_CLASS)
jar cfm $@ Manifest-fat.txt \
-C classes altosmapd
+if STRIP_NONDETERMINISM
+ $(STRIP_NONDETERMINISM) $@
+endif
altos-mapd: Makefile
echo "#!/bin/sh" > $@
echo 'exec java -Djava.library.path="$(altoslibdir)" -jar "$(altosmapddir)/altosmapd.jar" "$$@"' >> $@
chmod +x $@
altos-mapd: Makefile
echo "#!/bin/sh" > $@
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)"' >> $@
altos-mapd-test: Makefile
echo '#!/bin/sh' > $@
echo 'dir="$$(dirname $$0)"' >> $@
@@
-63,3
+81,6
@@
$(ALTOSLIB_CLASS):
-rm -f "$@"
$(LN_S) ../../altoslib/"$@" .
-rm -f "$@"
$(LN_S) ../../altoslib/"$@" .
+
+clean::
+ rm -f Manifest.txt