Index: libapol/swig/java/Makefile.am
===================================================================
--- libapol/swig/java/Makefile.am.orig
+++ libapol/swig/java/Makefile.am
@@ -97,7 +97,7 @@ classes = $(patsubst %.java, $(package_d
 # just depend upon the first class file, and let the Java compiler
 # create the rest of them.
 $(firstword $(classes)): $(java_files)
-	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
 
 $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
 
Index: libapol/swig/java/Makefile.in
===================================================================
--- libapol/swig/java/Makefile.in.orig
+++ libapol/swig/java/Makefile.in
@@ -687,7 +687,7 @@ $(wrappedso_DATA): $(filter %.c, $(BUILT
 # just depend upon the first class file, and let the Java compiler
 # create the rest of them.
 $(firstword $(classes)): $(java_files)
-	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
 
 $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
 
Index: libpoldiff/swig/java/Makefile.am
===================================================================
--- libpoldiff/swig/java/Makefile.am.orig
+++ libpoldiff/swig/java/Makefile.am
@@ -72,7 +72,7 @@ classes = $(patsubst %.java, $(package_d
 # just depend upon the first class file, and let the Java compiler
 # create the rest of them.
 $(firstword $(classes)): $(java_files)
-	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
 
 $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
 
Index: libpoldiff/swig/java/Makefile.in
===================================================================
--- libpoldiff/swig/java/Makefile.in.orig
+++ libpoldiff/swig/java/Makefile.in
@@ -662,7 +662,7 @@ $(wrappedso_DATA): $(filter %.c, $(BUILT
 # just depend upon the first class file, and let the Java compiler
 # create the rest of them.
 $(firstword $(classes)): $(java_files)
-	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
 
 $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
 
Index: libqpol/swig/java/Makefile.am
===================================================================
--- libqpol/swig/java/Makefile.am.orig
+++ libqpol/swig/java/Makefile.am
@@ -77,7 +77,7 @@ classes = $(patsubst %.java,$(package_di
 # just depend upon the first class file, and let the Java compiler
 # create the rest of them.
 $(firstword $(classes)): $(filter %.java, $(BUILT_SOURCES))
-	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
 
 $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
 
Index: libqpol/swig/java/Makefile.in
===================================================================
--- libqpol/swig/java/Makefile.in.orig
+++ libqpol/swig/java/Makefile.in
@@ -664,7 +664,7 @@ $(wrappedso_DATA): $(filter %.c, $(BUILT
 # just depend upon the first class file, and let the Java compiler
 # create the rest of them.
 $(firstword $(classes)): $(filter %.java, $(BUILT_SOURCES))
-	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
 
 $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
 
Index: libseaudit/swig/java/Makefile.am
===================================================================
--- libseaudit/swig/java/Makefile.am.orig
+++ libseaudit/swig/java/Makefile.am
@@ -69,7 +69,7 @@ classes = $(patsubst %.java, $(package_d
 # just depend upon the first class file, and let the Java compiler
 # create the rest of them.
 $(firstword $(classes)): $(java_files)
-	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
 
 $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
 
Index: libseaudit/swig/java/Makefile.in
===================================================================
--- libseaudit/swig/java/Makefile.in.orig
+++ libseaudit/swig/java/Makefile.in
@@ -659,7 +659,7 @@ $(wrappedso_DATA): $(filter %.c, $(BUILT
 # just depend upon the first class file, and let the Java compiler
 # create the rest of them.
 $(firstword $(classes)): $(java_files)
-	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
 
 $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
 
Index: libsefs/swig/java/Makefile.am
===================================================================
--- libsefs/swig/java/Makefile.am.orig
+++ libsefs/swig/java/Makefile.am
@@ -64,7 +64,7 @@ classes = $(patsubst %.java, $(package_d
 # just depend upon the first class file, and let the Java compiler
 # create the rest of them.
 $(firstword $(classes)): $(java_files)
-	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
 
 $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))
 
Index: libsefs/swig/java/Makefile.in
===================================================================
--- libsefs/swig/java/Makefile.in.orig
+++ libsefs/swig/java/Makefile.in
@@ -654,7 +654,7 @@ $(wrappedso_DATA): $(filter %.cc, $(BUIL
 # just depend upon the first class file, and let the Java compiler
 # create the rest of them.
 $(firstword $(classes)): $(java_files)
-	$(JAVAC) $(AM_JFLAGS) $(JAVAFLAGS) -d . $^
+	$(JAVAC) $(AM_JFLAGS) $(JAVACFLAGS) -d . $^
 
 $(wordlist 2,$(words $(classes)),$(classes)): $(firstword $(classes))