From 02b03bc6c10be7b1591468106007f4624f8525bd Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Thu, 30 Jun 2011 22:41:52 -0400
Subject: CONFIGURE: Rename $WIN32BUILD to $STAGING

---
 .gitignore |  1 +
 configure  |  4 ++--
 ports.mk   | 28 ++++++++++++----------------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ad9f07b34..99902064ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ lib*.a
 /Icon.*
 
 /build
+/staging
 
 /backends/platform/dc/gui
 /backends/platform/dc/graphics
diff --git a/configure b/configure
index 932ab9a31c..78998f8100 100755
--- a/configure
+++ b/configure
@@ -174,7 +174,7 @@ _strip=strip
 _ar="ar cru"
 _as="as"
 _windres=windres
-_win32build="build/x86"
+_stagingpath="staging"
 _win32path="c:/scummvm"
 _aos4path="Games:ScummVM"
 _staticlibpath=/sw
@@ -3519,7 +3519,7 @@ AS := $_as
 ASFLAGS := $ASFLAGS
 WINDRES := $_windres
 WINDRESFLAGS := $WINDRESFLAGS
-WIN32BUILD=$_win32build
+STAGINGPATH=$_stagingpath
 WIN32PATH=$_win32path
 AOS4PATH=$_aos4path
 STATICLIBPATH=$_staticlibpath
diff --git a/ports.mk b/ports.mk
index 495037aaf1..80d2cd7f02 100644
--- a/ports.mk
+++ b/ports.mk
@@ -186,22 +186,18 @@ endif
 
 # Special target to create a win32 NSIS installer
 win32setup: $(EXECUTABLE)
-	mkdir -p $(srcdir)/$(WIN32BUILD)
-	cp $(srcdir)/AUTHORS          $(srcdir)/$(WIN32BUILD)
-	cp $(srcdir)/COPYING          $(srcdir)/$(WIN32BUILD)
-	cp $(srcdir)/COPYING.LGPL     $(srcdir)/$(WIN32BUILD)
-	cp $(srcdir)/COPYRIGHT        $(srcdir)/$(WIN32BUILD)
-	cp $(srcdir)/NEWS             $(srcdir)/$(WIN32BUILD)
-	cp $(srcdir)/README           $(srcdir)/$(WIN32BUILD)
-	cp /usr/local/README-SDL.txt  $(srcdir)/$(WIN32BUILD)/README-SDL
-	unix2dos $(srcdir)/$(WIN32BUILD)/*.*
-	$(STRIP) $(EXECUTABLE) -o $(srcdir)/$(WIN32BUILD)/$(EXECUTABLE)
-	cp $(DIST_FILES_THEMES) $(srcdir)/$(WIN32BUILD)
-ifdef DIST_FILES_ENGINEDATA
-	cp $(DIST_FILES_ENGINEDATA) $(srcdir)/$(WIN32BUILD)
-endif
-	cp /usr/local/bin/SDL.dll $(srcdir)/$(WIN32BUILD)
-	makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(WIN32BUILD)" -Dbuild_dir="../../$(WIN32BUILD)" $(srcdir)/dists/win32/scummvm.nsi
+	mkdir -p $(srcdir)/$(STAGINGPATH)
+	cp $(srcdir)/AUTHORS          $(srcdir)/$(STAGINGPATH)
+	cp $(srcdir)/COPYING          $(srcdir)/$(STAGINGPATH)
+	cp $(srcdir)/COPYING.LGPL     $(srcdir)/$(STAGINGPATH)
+	cp $(srcdir)/COPYRIGHT        $(srcdir)/$(STAGINGPATH)
+	cp $(srcdir)/NEWS             $(srcdir)/$(STAGINGPATH)
+	cp $(srcdir)/README           $(srcdir)/$(STAGINGPATH)
+	cp /usr/local/README-SDL.txt  $(srcdir)/$(STAGINGPATH)/README-SDL
+	unix2dos $(srcdir)/$(STAGINGPATH)/*.*
+	$(STRIP) $(EXECUTABLE) -o $(srcdir)/$(STAGINGPATH)/$(EXECUTABLE)
+	cp /usr/local/bin/SDL.dll $(srcdir)/$(STAGINGPATH)
+	makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(STAGINGPATH)" -Dbuild_dir="../../$(STAGINGPATH)" $(srcdir)/dists/win32/scummvm.nsi
 
 #
 # AmigaOS specific
-- 
cgit v1.2.3