From b4cf5ec4d6a038e3d73b2f7197964c6bea47dbc3 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 17 May 2018 10:41:10 +0100
Subject: [PATCH] Makefile: Don't leave class-file placement to the `FOOFLAGS'
 variables.

They can (and should) be overridden by users.  But changing the output
arrangements will break the build system's assumptions.
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 0687ba2..7b74740 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,10 @@ LD			 = gcc
 LDFLAGS.so		 = -shared
 
 JAVAC			 = javac
-JAVAFLAGS		 = -d .
+JAVAFLAGS		 =
 
 SCALAC			 = fsc
-SCALAFLAGS		 = -d . -optimise
+SCALAFLAGS		 = -optimise
 
 all::
 .PHONY: all
@@ -30,9 +30,9 @@ all::
 CLEANFILES		+= *.o *.d
 
 %.stamp: %.java
-	$(call v_tag,JAVAC)$(JAVAC) $(JAVAFLAGS) $< && echo built >$@
+	$(call v_tag,JAVAC)$(JAVAC) -d . $(JAVAFLAGS) $< && echo built >$@
 %.stamp: %.scala
-	$(call v_tag,SCALAC)$(SCALAC) $(SCALAFLAGS) $< && echo built >$@
+	$(call v_tag,SCALAC)$(SCALAC) -d . $(SCALAFLAGS) $< && echo built >$@
 CLEANFILES		+= *.stamp
 
 objects			 = $(patsubst %.c,%$2,$1)
-- 
2.11.0