-flowerout = $(buildprefix)/flower/$(OUTDIR_NAME)
-libout = $(buildprefix)/lib/$(OUTDIR_NAME)
-lilyout = $(buildprefix)/lily/$(OUTDIR_NAME)
-mi2muout = $(buildprefix)/mi2mu/$(OUTDIR_NAME)
-makeout = $(buildprefix)/make/$(OUTDIR_NAME)
-docout = $(buildprefix)/Documentation/$(OUTDIR_NAME)
-binout = $(buildprefix)/bin/$(OUTDIR_NAME)
+flowerout = $(buildprefix)/flower/$(outdir)
+libout = $(buildprefix)/lib/$(outdir)
+lilyout = $(buildprefix)/lily/$(outdir)
+mi2muout = $(buildprefix)/mi2mu/$(outdir)
+makeout = $(buildprefix)/make/$(outdir)
+docout = $(buildprefix)/Documentation/$(outdir)
+binout = $(buildprefix)/bin/$(outdir)