--- a/components/grails/Makefile	Thu May 28 03:17:48 2015 -0700
+++ b/components/grails/Makefile	Fri May 29 13:29:35 2015 -0700
@@ -39,6 +39,14 @@
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ant.mk
+
+# Need to package the .jar files we've built, not the ones included in
+# the source tarball.  So we need $(BUILD_DIR_32) added to $(PKG_PROTO_DIRS)
+# but it has to come at the beginning not the end, so we set it before we
+# include ips.mk.
+
+PKG_PROTO_DIRS = $(BUILD_DIR_32)
+
 include $(WS_MAKE_RULES)/ips.mk
 
 # Make sure we use the specially modified versions of grails and grails-debug
@@ -49,11 +57,6 @@
 COMPONENT_PRE_BUILD_ACTION = $(MKDIR) $(@D)/tmp 
 COMPONENT_BUILD_ENV += "ANT_OPTS=-Djava.io.tmpdir=$(BUILD_DIR_32)/tmp"
 
-# Need to package the .jar files we've built, not the ones included in
-# the source tarball.
-PKG_PROTO_DIRS = $(BUILD_DIR_32) $(MANGLED_DIR) $(PROTO_DIR) $(@D) \
-	$(COMPONENT_DIR) $(COMPONENT_SRC)
-
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets