Package: libreadline-java / 0.8.0.1+dfsg-9

makefile-fix.patch Patch series | download
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
Description: Make the top level Makefile use correct java tools
 and link against system javadoc.

--- libreadline-java-0.8.0.1.orig/Makefile
+++ libreadline-java-0.8.0.1/Makefile
@@ -86,10 +86,10 @@ RPM_BASE        = `pwd`/$(BUILDDIR)/
 world : jar build-native
 
 jar: build-java
-	cd $(BUILDDIR) ; jar -cvmf ../$(MF_STUB) ../$(JAR) *
+	cd $(BUILDDIR) ; $(JAVA_HOME)/bin/jar -cvf ../$(JAR) org
 
 $(JAR):
-	cd $(BUILDDIR) ; jar -cvmf ../$(MF_STUB) ../$(JAR) *
+	cd $(BUILDDIR) ; $(JAVA_HOME)/bin/jar -cvf ../$(JAR) org
 
 build-java: $(BUILDDIR)
 	cd src ; $(MAKE) JAVAC="$(JAVAC)" JC_FLAGS="$(JC_FLAGS)" java
@@ -99,9 +99,9 @@ build-native:
 		        JAVANATINC="$(JAVANATINC)" native
 
 apidoc: $(APIDIR)
-	javadoc -sourcepath src -d $(APIDIR) -windowtitle $(WTITLE) \
+	$(JAVA_HOME)/bin/javadoc -sourcepath src -d $(APIDIR) -windowtitle $(WTITLE) \
                 -doctitle $(DTITLE) -footer $(DFOOTER) -header $(DHEADER) \
-                -bottom $(DBOTTOM) \
+                -bottom $(DBOTTOM) -link /usr/share/doc/default-jdk-doc/api \
                 -version -author org.gnu.readline test
 
 install: jar build-native apidoc