From 5e3546154aab9a6acd96ff2a10b2d40dfdbdf0e4 Mon Sep 17 00:00:00 2001
From: Richard Helgeby <devnull@localhost>
Date: Sat, 26 Dec 2009 21:36:50 +0100
Subject: [PATCH] Fixed merge conflicts in imported patch.

---
 build.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/build.sh b/build.sh
index 4216120..b3fd81f 100644
--- a/build.sh
+++ b/build.sh
@@ -1,18 +1,23 @@
 #!/bin/sh
 
-RELEASEDIR=release
-BUILDDIR=build
 VERSION="zombiereloaded-3.0-b2"
 REVISION=$(hg id -n)
-ZIPFILE=$VERSION-r$REVISION.zip
-
-PLUGINFILES="cstrike/*"
-DOCS="docs/*"
-DOCS_DEST=$RELEASEDIR/zrdocs
-PLUGINFILE=zombiereloaded.smx
-PLUGINDIR=$RELEASEDIR/addons/sourcemod/plugins
-ZRTOOLS_SOURCE=/home/zrdev/archive/zrtools
+
+# Source paths
+BUILDDIR=build
+PLUGINFILE=zombiereloaded.smx
+PLUGINFILES="cstrike/*"
+ZRTOOLS_SOURCE=/home/zrdev/archive/zrtools
+DOCS="docs/*"
+SOURCEDIR="src/*"
+
+# Destination paths
+RELEASEDIR=release
+SOURCE_DEST=$RELEASEDIR/addons/sourcemod/scripting
+DOCS_DEST=$RELEASEDIR/zrdocs
+PLUGINDIR=$RELEASEDIR/addons/sourcemod/plugins
 EXTENSIONDIR=$RELEASEDIR/addons/sourcemod/extensions
+ZIPFILE=$VERSION-r$REVISION.zip
 
 MAKEPATCH=false