From 58912f68c2489bcee787599837447e0d64dfd61a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 24 May 2017 21:03:56 +0200
Subject: New upstream version 1.0.27

---
 japi/Makefile.am | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'japi/Makefile.am')

diff --git a/japi/Makefile.am b/japi/Makefile.am
index 5d66e82..cc7ac4a 100644
--- a/japi/Makefile.am
+++ b/japi/Makefile.am
@@ -8,19 +8,15 @@
 #	Makefile for a Java project with native methods.
 #
 
-V_MAJOR = @V_MAJOR@
-V_MINOR = @V_MINOR@
-V_REV = @V_REV@
-
 JAVAROOT=.
-CLASSPATH_ENV=.
-JAVAH=javah -jni -cp $(CLASSPATH_ENV)
+MY_CLASSPATH=.
+JAVAH=javah -jni -cp $(MY_CLASSPATH)
 
 #	We'll need something in 'configure' for the Java includes.
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include \
+AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include \
 	      -I$(top_srcdir)/include -I${JDK_HOME}/include \
 	      -I${JDK_HOME}/include/genunix
-AM_LDFLAGS = @STRICT_LDFLAGS@ -version-number $(V_MAJOR):$(V_MINOR):$(VREV)
+AM_LDFLAGS += $(STRICT_LDFLAGS) -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
 
 JAVA_SRC = SaneDevice.java SaneOption.java SaneRange.java\
 	   Sane.java SaneParameters.java ScanIt.java \
@@ -31,7 +27,7 @@ dist_noinst_JAVA = $(JAVA_SRC)
 
 LIBSANE = ../backend/libsane.la
 
-EXTRA_DIST = Makefile.in README.JAVA 
+EXTRA_DIST = README.JAVA
 
 lib_LTLIBRARIES = libsanej.la
 
-- 
cgit v1.2.3