blob: 305207ef779f5e8c6f9c5d7dd22a88171efd94f3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -11,8 +12,7 @@
CLEANFILES = ThePEG.jar thepeg.sh
-jardir = $(pkglibdir)
-nodist_jar_DATA = ThePEG.jar
+noinst_DATA = ThePEG.jar
dist_noinst_DATA = $(JAVASOURCES) jar-manifest
@@ -34,7 +34,7 @@
$(JAR) cmf ThePEG/jar-manifest ThePEG.jar ThePEG/*.class
thepeg.sh: thepeg.install Makefile
- sed -e s:@pkglibdir[@]:$(pkglibdir):g \
+ sed -e s:@datadir[@]:$(datadir):g \
-e s:@bindir[@]:$(bindir):g \
-e s:@java[@]:$(JAVA):g $(srcdir)/thepeg.install > thepeg.sh
chmod +x thepeg.sh
--- a/java/thepeg.install
+++ b/java/thepeg.install
@@ -1,6 +1,6 @@
#!/bin/sh
-pkglibdir=@pkglibdir@
+source @datadir@/thepeg/package.env
bindir=@bindir@
ThePEG_CMD="${bindir}/setupThePEG"
@@ -19,4 +19,4 @@
-exec @java@ ${HEADLESS} -jar ${pkglibdir}/ThePEG.jar ${ThePEG_CMD} "$@"
+exec @java@ ${HEADLESS} -jar ${CLASSPATH} ${ThePEG_CMD} "$@"
|
