Make sure files aren't created in srcdir during objdir build

git-svn-id: svn://10.0.0.236/trunk@169876 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/extensions/java/xpcom/package/Makefile.in

@@ -19,7 +19,8 @@
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-#   Javier Pedemonte (jhpedemonte@gmail.com)
+#   Brian Ryner <bryner@brianryner.com>
+#   Javier Pedemonte <jhpedemonte@gmail.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -43,8 +44,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/rules.mk
-
 ifeq ($(OS_ARCH),WINNT)
 PKGCP_PLATFORM = dos
 PACKAGE_FILE = packages-win
@@ -59,14 +58,27 @@ endif
 
 PACKAGE_VERSION = 0.1
 
-xpi:
+GARBAGE += javaconnect.js javaconnect.template
+GARBAGE_DIRS += stage
+
+include $(topsrcdir)/config/rules.mk
+
+stage/javaconnect/.done:
 	@echo Copying files to staging area...
 	rm -rf stage
 	$(NSINSTALL) -D stage
-	$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -o $(PKGCP_PLATFORM) -s $(DIST) -d stage -f $(srcdir)/$(PACKAGE_FILE) -v
-	@echo Creating install.js...
+	$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -o $(PKGCP_PLATFORM) \
+		-s $(DIST) -d stage -f $(srcdir)/$(PACKAGE_FILE) -v
+
+javaconnect.js: stage/javaconnect/.done
+	@echo Creating $@...
 	rm -f javaconnect.js
-	$(PERL) $(topsrcdir)/toolkit/mozapps/installer/makejs.pl $(srcdir)/javaconnect.jst $(PACKAGE_VERSION) stage/javaconnect
-	if ! test -e "javaconnect.js"; then $(NSINSTALL) $(srcdir)/javaconnect.js .; fi
+	@if ! test -e "javaconnect.jst"; then             \
+		$(INSTALL) -m 644 $(srcdir)/javaconnect.jst .; \
+	fi
+	$(PERL) $(topsrcdir)/toolkit/mozapps/installer/makejs.pl javaconnect.jst \
+		$(PACKAGE_VERSION) stage/javaconnect
+
+xpi: javaconnect.js
 	@echo Creating XPI...
 	$(PERL) $(topsrcdir)/toolkit/mozapps/installer/makexpi.pl javaconnect stage .