summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2010-02-01 10:22:46 -0800
committerEric Sandall2010-02-06 18:00:25 -0800
commitcf01a372e847d2163fa9c1e4d9b512c6dbd4b9f2 (patch)
treee9958abb4359daa6b4dae71f7358bbdc140aa9af
parent52c819b952dbe6c73cbffaaaa0e55d9642bd0ef4 (diff)
ndiswrapper: Only create/remove ndiswrapper-svn if NDIS_SVN = y
(cherry picked from commit 9d256c7b32b7c33af53def2b1bd15b4069298747)
-rwxr-xr-xkernels/ndiswrapper/FINAL2
-rw-r--r--kernels/ndiswrapper/HISTORY4
-rwxr-xr-xkernels/ndiswrapper/PRE_BUILD2
3 files changed, 6 insertions, 2 deletions
diff --git a/kernels/ndiswrapper/FINAL b/kernels/ndiswrapper/FINAL
index 90fd9b3642..b6f82baabd 100755
--- a/kernels/ndiswrapper/FINAL
+++ b/kernels/ndiswrapper/FINAL
@@ -1 +1 @@
-rmdir $BUILD_DIRECTORY/ndiswrapper-svn
+[[ "$$NDIS_SVN" == "y" ]] && rmdir $BUILD_DIRECTORY/ndiswrapper-svn || true
diff --git a/kernels/ndiswrapper/HISTORY b/kernels/ndiswrapper/HISTORY
index 1cb3419e2f..0016b64b8c 100644
--- a/kernels/ndiswrapper/HISTORY
+++ b/kernels/ndiswrapper/HISTORY
@@ -1,3 +1,7 @@
+2010-02-01 Eric Sandall <sandalle@sourcemage.org>
+ * PRE_BUILD: Only create ndiswrapper-svn if NDIS_SVN = y
+ * FINAL: Only remove ndiswrapper-svn if NDIS_SVN = y, always success
+
2009-01-22 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 1.54
diff --git a/kernels/ndiswrapper/PRE_BUILD b/kernels/ndiswrapper/PRE_BUILD
index 6c8e20911b..1ec2ffd50f 100755
--- a/kernels/ndiswrapper/PRE_BUILD
+++ b/kernels/ndiswrapper/PRE_BUILD
@@ -1,2 +1,2 @@
-mkdir $BUILD_DIRECTORY/ndiswrapper-svn &&
+[[ "$$NDIS_SVN" == "y" ]] && mkdir $BUILD_DIRECTORY/ndiswrapper-svn
default_pre_build