[SM-Commit] GIT changes to master games grimoire by Andraž Levstik (e7afc0c20549795e09c39127892f19d20238ef63)

Andraž Levstik scm at mail.sourcemage.org
Mon Mar 12 17:39:43 EDT 2007


GIT changes to master games grimoire by Andraž Levstik <ruskie at mages.ath.cx>:

 ChangeLog |    3 ++-
 FUNCTIONS |    9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit e7afc0c20549795e09c39127892f19d20238ef63
Author: Andraž Levstik <ruskie at mages.ath.cx>
Commit: Andraž Levstik <ruskie at mages.ath.cx>

    FUNCTIONS: minor update

diff --git a/ChangeLog b/ChangeLog
index db8d6da..2bada4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2007-03-12 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
-	* FUNCTIONS: added removal of empty gather docs dirs
+	* FUNCTIONS: added removal of empty gather docs dirs, minor fix for
+	  STAGED_INSTALL
 
 2007-03-05 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* games-strategy-rts/bos: deprecated in favour of boswars
diff --git a/FUNCTIONS b/FUNCTIONS
index 5b4387d..661bdf9 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -158,8 +158,13 @@ fi
 
 function default_post_install() {
   games_make_proper_binary &&
-  rmdir --ignore-fail-on-non-empty ${INSTALL_ROOT}/usr/share/games/${SPELL} &&
-  rmdir --ignore-fail-on-non-empty ${INSTALL_ROOT}/usr/share/doc/${SPELL} &&
+  if [[ $STAGED_INSTALL != off ]]
+    rmdir --ignore-fail-on-non-empty ${STAGE_DIRECTORY}/TRANSL/usr/share/games/${SPELL} &&
+    rmdir --ignore-fail-on-non-empty ${STAGE_DIRECTORY}/TRANSL/usr/share/doc/${SPELL}
+  else
+    rmdir --ignore-fail-on-non-empty ${INSTALL_ROOT}/usr/share/games/${SPELL} &&
+    rmdir --ignore-fail-on-non-empty ${INSTALL_ROOT}/usr/share/doc/${SPELL}
+  fi
   real_default_post_install
 }
 



More information about the SM-Commit mailing list