Merge branch 'master' into releases

[rocksndiamonds.git] / Makefile

diff --git a/Makefile b/Makefile
index c157ab6468e7e118c368e0f220559696df01f26c..8a51c93a811025640d07da5f7ae7622a3483046f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # =============================================================================
 # Rocks'n'Diamonds Makefile
 # -----------------------------------------------------------------------------
-# (c) 1995-2007 Holger Schemel <info@artsoft.org>
+# (c) 1995-2013 Holger Schemel <info@artsoft.org>
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -22,10 +22,14 @@ X11_PATH = /usr/X11R6
 # directory for read-only game data (like graphics, sounds, levels)
 # default is '.' to be able to run program without installation
 # RO_GAME_DIR = /usr/games
+# use the following setting for Debian / Ubuntu installations:
+# RO_GAME_DIR = /usr/share/games/rocksndiamonds
 
 # directory for writable game data (like highscore files)
 # default is '.' to be able to run program without installation
 # RW_GAME_DIR = /var/games
+# use the following setting for Debian / Ubuntu installations:
+# RW_GAME_DIR = /var/games/rocksndiamonds
 
 # uncomment if system has no joystick include file
 # JOYSTICK = -DNO_JOYSTICK
@@ -139,7 +143,7 @@ backup:
 backup-net-copy:
        ./Scripts/make_backup.sh src scp
 
-backup-net: backup backup-net-copy
+backup-all: backup backup-net-copy
 
 backup_lev:
        ./Scripts/make_backup.sh lev
@@ -151,8 +155,10 @@ backup_gfx:
 #      ./Scripts/make_prerelease.sh
 
 jue:
-       sed -e 's/# SPECIAL_EDITION/SPECIAL_EDITION/' Makefile > Makefile.jue
-       $(MAKE) -f Makefile.jue cross-win32
+       @$(MAKE) SPECIAL_EDITION=rnd_jue all
+
+jue-win:
+       @$(MAKE) SPECIAL_EDITION=rnd_jue cross-win32
 
 dist-clean:
        @$(MAKE_CMD) dist-clean
@@ -169,6 +175,9 @@ dist-build-win32:
 dist-build-macosx:
        # (this is done by "dist-package-macosx" target)
 
+dist-build-macosx-ppc:
+       # (this is done by "dist-package-macosx-ppc" target)
+
 dist-package-unix:
        ./Scripts/make_dist.sh unix .
 
@@ -181,6 +190,9 @@ dist-package-win32:
 dist-package-macosx:
        ./Scripts/make_dist.sh mac . $(MAKE)
 
+dist-package-macosx-ppc:
+       ./Scripts/make_dist.sh mac-ppc . $(MAKE)
+
 dist-upload-unix:
        ./Scripts/make_dist.sh unix . upload
 
@@ -193,6 +205,9 @@ dist-upload-win32:
 dist-upload-macosx:
        ./Scripts/make_dist.sh mac . upload
 
+dist-upload-macosx-ppc:
+       ./Scripts/make_dist.sh mac-ppc . upload
+
 dist-build-all:
        $(MAKE) clean
        $(MAKE) dist-build-unix         ; $(MAKE) dist-clean
@@ -203,12 +218,14 @@ dist-package-all:
        $(MAKE) dist-package-unix
        $(MAKE) dist-package-win32
        $(MAKE) dist-package-macosx
+       $(MAKE) dist-package-macosx-ppc
 #      $(MAKE) dist-package-msdos
 
 dist-upload-all:
        $(MAKE) dist-upload-unix
        $(MAKE) dist-upload-win32
        $(MAKE) dist-upload-macosx
+       $(MAKE) dist-upload-macosx-ppc
 #      $(MAKE) dist-upload-msdos
 
 dist-all: dist-build-all dist-package-all