Merged back changes from 0.3.x branch

[supertux.git] / Jamfile

diff --git a/Jamfile b/Jamfile
index 7d28f49..7d87bfc 100644 (file)
--- a/Jamfile
+++ b/Jamfile
@@ -1,22 +1,9 @@
-# warning for people who try jam install
-actions InstallWarning
-{
-    echo "****************************************************************"
-    echo "* WARNING: Installation is currently broken                    *"
-    echo "* Please start the game directly from source directory instead *"
-    echo "****************************************************************"
-    sleep 5
-}
-
-InstallWarning installwarning ;
-Always installwarning ;
-Depends install : installwarning ;
-
-
 SubDir TOP ;
 
-# Decend into subdirs
-SubInclude TOP tools miniswig ;
+# Descend into subdirs
+if ! $(RELEASE) {
+    SubInclude TOP tools miniswig ;
+}
 SubInclude TOP src ;
 SubInclude TOP data ;
 
@@ -27,6 +14,6 @@ XGETTEXT_FLAGS on data/locale/messages.pot += -k_ -C ;
 
 InstallPixmap data/images/engine/icons/supertux.png data/images/engine/icons/supertux.xpm ;
 InstallDesktop supertux.desktop ;
-InstallDoc INSTALL README COPYING ;
-Package INSTALL README COPYING ;
+InstallDoc INSTALL README COPYING WHATSNEW.txt ;
+Package INSTALL README COPYING WHATSNEW.txt ;