[Pingus-CVS] r4133 - trunk/pingus

[grumbel]

Author: grumbel
Date: 2010-10-30 17:45:44 +0200 (Sat, 30 Oct 2010)
New Revision: 4133

Added:
   trunk/pingus/Makefile
Removed:
   trunk/pingus/install.sh
Log:
Removed install.sh, let Makefile handle installing

Added: trunk/pingus/Makefile
===================================================================
--- trunk/pingus/Makefile                               (rev 0)
+++ trunk/pingus/Makefile       2010-10-30 15:45:44 UTC (rev 4133)
@@ -0,0 +1,60 @@
+##  Pingus - A free Lemmings clone
+##  Copyright (C) 2010 Ingo Ruhnke <address@hidden>
+##
+##  This program is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  (at your option) any later version.
+##  
+##  This program is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##  
+##  You should have received a copy of the GNU General Public License
+##  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+DESTDIR = 
+PREFIX  = "/usr/local"
+DATADIR = "${PREFIX}/share/pingus"
+BINDIR  = "${PREFIX}/bin"
+
+build/pingus:
+       scons
+
+clean:
+       scons -c
+       rm -rf .sconf_temp/
+       rm -f .sconsign.dblite
+
+install: install-exec install-data
+
+install-exec: build/pingus
+       install -d "${DESTDIR}${BINDIR}"
+
+       install -D build/pingus "${DESTDIR}${BINDIR}/pingus.bin"
+       echo "#!/bin/sh\nexec \"${BINDIR}/pingus.bin\" --datadir 
\"${DATADIR}\"" > "${DESTDIR}${BINDIR}/pingus"
+       chmod 755 "${DESTDIR}${BINDIR}/pingus"
+
+install-data:
+       cd data/ && \
+       find . \
+        -type f -a  \( \
+        -name "*.png" -o \
+        -name "*.jpg" -o \
+        -name "*.wav" -o \
+        -name "*.scm" -o \
+        -name "*.font" -o \
+        -name "*.it" -o \
+        -name "*.ogg" -o \
+        -name "*.s3m" -o \
+        -name "*.po" -o \
+        -name "*.worldmap" -o \
+        -name "*.res" -o \
+        -name "*.pingus" -o \
+        -name "*.levelset" \
+        \) -exec install -D {} ${DESTDIR}${DATADIR}/{} \;
+
+.PHONY : clean install install-exec install-data
+
+# EOF #

Deleted: trunk/pingus/install.sh
===================================================================
--- trunk/pingus/install.sh     2010-08-19 13:59:57 UTC (rev 4132)
+++ trunk/pingus/install.sh     2010-10-30 15:45:44 UTC (rev 4133)
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ $# -ne 1 ]; then
-    echo "Usage $0 DIRECTORY"
-else
-    if [ ! -x ./pingus ]; then
-        echo "Error: You have to compile pingus first before you can install 
it."
-        echo "To compile it, type:"
-        echo ""
-        echo "  scons"
-        echo ""
-        exit 1
-    fi
-
-    BINDIR="$1/bin/"
-    DATADIR="$1/share/pingus/"
-
-    echo "Installing Pingus in: $1"
-
-    mkdir -p "$BINDIR"
-    mkdir -p "$DATADIR"
-
-    install -v pingus "$BINDIR/pingus"
-
-    find data/ \
-        -type f -a  \( \
-        -name "*.png" -o \
-        -name "*.jpg" -o \
-        -name "*.wav" -o \
-        -name "*.scm" -o \
-        -name "*.font" -o \
-        -name "*.it" -o \
-        -name "*.ogg" -o \
-        -name "*.s3m" -o \
-        -name "*.po" -o \
-        -name "*.worldmap" -o \
-        -name "*.res" -o \
-        -name "*.pingus" -o \
-        -name "*.levelset" \
-        \) -exec cp --parents -v {} "$DATADIR" \;
-        
-   echo ""
-   echo "Pingus installation complete, you can start the games with:"
-   echo ""
-   echo "  ${BINDIR}pingus"
-   echo
-fi
-
-# EOF #