makefile and debian cleanups

This commit is contained in:
p.kosyh 2010-06-08 12:01:00 +00:00
parent 76e90030df
commit 76a49c28f5
6 changed files with 39 additions and 26 deletions

View file

@ -2,11 +2,12 @@ VERSION := 1.2.0
DESTDIR= DESTDIR=
BIN= BIN=
STEADPATH=./stead DATAPATH=.
THEMESPATH=./themes STEADPATH=$(DATAPATH)/stead
GAMESPATH=./games THEMESPATH=$(DATAPATH)/themes
ICONPATH=./icon GAMESPATH=$(DATAPATH)/games
LANGPATH=./languages ICONPATH=$(DATAPATH)/icon
LANGPATH=$(DATAPATH)/languages
DOCPATH= DOCPATH=
MANPATH= MANPATH=
SYSTEMSETUP=no SYSTEMSETUP=no

View file

@ -3,12 +3,13 @@ VERSION := 1.2.0
PREFIX=/usr/local PREFIX=/usr/local
DESTDIR= DESTDIR=
BIN=$(DESTDIR)$(PREFIX)/bin/ BIN=$(DESTDIR)$(PREFIX)/bin/
STEADPATH=$(DESTDIR)$(PREFIX)/share/instead DATAPATH=$(DESTDIR)$(PREFIX)/share/instead
THEMESPATH=$(STEADPATH)/themes STEADPATH=$(DATAPATH)/stead
GAMESPATH=$(STEADPATH)/games THEMESPATH=$(DATAPATH)/themes
GAMESPATH=$(DATAPATH)/games
ICONPATH=$(DESTDIR)$(PREFIX)/share/pixmaps ICONPATH=$(DESTDIR)$(PREFIX)/share/pixmaps
DOCPATH=$(DESTDIR)$(PREFIX)/share/doc/instead DOCPATH=$(DESTDIR)$(PREFIX)/share/doc/instead
LANGPATH=$(STEADPATH)/languages LANGPATH=$(DATAPATH)/languages
MANPATH=$(DESTDIR)$(PREFIX)/share/man/man6 MANPATH=$(DESTDIR)$(PREFIX)/share/man/man6
SYSTEMSETUP=yes SYSTEMSETUP=yes

View file

@ -4,11 +4,12 @@ PREFIX=
DESTDIR= DESTDIR=
BIN=..\..\bin\\ BIN=..\..\bin\\
STEADPATH=./stead DATAPATH=.
THEMESPATH=./themes/ STEADPATH=$(DATAPATH)/stead
GAMESPATH=./games THEMESPATH=$(DATAPATH)/themes/
ICONPATH=./icon GAMESPATH=$(DATAPATH)/games
LANGPATH=./languages ICONPATH=$(DATAPATH)/icon
LANGPATH=$(DATAPATH)/languages
ZLIB_CFLAGS=-I../zlib ZLIB_CFLAGS=-I../zlib
ZLIB_LFLAGS=../zlib/libz.a ZLIB_LFLAGS=../zlib/libz.a

View file

@ -9,9 +9,15 @@ echo "ok"
echo -n "Checking pkg-config --cflags zlib..." echo -n "Checking pkg-config --cflags zlib..."
if ! pkg-config --cflags zlib >/dev/null 2>&1; then if ! pkg-config --cflags zlib >/dev/null 2>&1; then
if [[ -f /usr/include/zlib.h ]]; then
echo "not found, but /usr/include/zlib.h exists..."
zlib_cflags="x"
zlib_libs=
else
echo "internal" echo "internal"
zlib_cflags= zlib_cflags=
zlib_libs= zlib_libs=
fi
else else
echo "system" echo "system"
zlib_cflags="pkg-config --cflags zlib" zlib_cflags="pkg-config --cflags zlib"
@ -117,6 +123,9 @@ if [[ -z "$zlib_cflags" ]]; then
echo "SUBDIRS=src/zlib" >> config.make echo "SUBDIRS=src/zlib" >> config.make
echo "ZLIB_CFLAGS=-I../zlib" >> config.make echo "ZLIB_CFLAGS=-I../zlib" >> config.make
echo "ZLIB_LFLAGS=../zlib/libz.a" >> config.make echo "ZLIB_LFLAGS=../zlib/libz.a" >> config.make
elif [ "$zlib_cflags" = "x" ]; then
echo "ZLIB_CFLAGS=" >> config.make
echo "ZLIB_LFLAGS=" >> config.make
else else
echo "ZLIB_CFLAGS=\$(shell $zlib_cflags)" >> config.make echo "ZLIB_CFLAGS=\$(shell $zlib_cflags)" >> config.make
echo "ZLIB_LFLAGS=\$(shell $zlib_libs)" >> config.make echo "ZLIB_LFLAGS=\$(shell $zlib_libs)" >> config.make
@ -154,12 +163,13 @@ elif [ "x$ans" = "x2" ]; then
echo "PREFIX=$prefix" >> config.make echo "PREFIX=$prefix" >> config.make
echo "BIN=\$(DESTDIR)\$(PREFIX)/bin/" >> config.make echo "BIN=\$(DESTDIR)\$(PREFIX)/bin/" >> config.make
echo "STEADPATH=\$(DESTDIR)\$(PREFIX)/share/instead" >> config.make echo "DATAPATH=\$(DESTDIR)\$(PREFIX)/share/instead" >> config.make
echo "THEMESPATH=\$(STEADPATH)/themes" >> config.make echo "STEADPATH=\$(DATAPATH)/stead" >> config.make
echo "GAMESPATH=\$(STEADPATH)/games" >> config.make echo "THEMESPATH=\$(DATAPATH)/themes" >> config.make
echo "GAMESPATH=\$(DATAPATH)/games" >> config.make
echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make
echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make
echo "LANGPATH=\$(STEADPATH)/languages" >> config.make echo "LANGPATH=\$(DATAPATH)/languages" >> config.make
echo "MANPATH=\$(DESTDIR)\$(PREFIX)/share/man/man6" >> config.make echo "MANPATH=\$(DESTDIR)\$(PREFIX)/share/man/man6" >> config.make
echo "Ok. We are ready to build and install. Use these commands:" echo "Ok. We are ready to build and install. Use these commands:"

2
debian/control vendored
View file

@ -2,7 +2,7 @@ Source: instead
Section: games Section: games
Priority: optional Priority: optional
Maintainer: Peter Kosyh <p.kosyh@gmail.com> Maintainer: Peter Kosyh <p.kosyh@gmail.com>
Build-Depends: debhelper (>= 7), pkg-config, liblua5.1-dev, libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev Build-Depends: debhelper (>= 7), pkg-config, liblua5.1-dev, libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev
Standards-Version: 3.8.3 Standards-Version: 3.8.3
Homepage: http://instead.googlecode.com Homepage: http://instead.googlecode.com

4
debian/rules vendored
View file

@ -30,7 +30,7 @@ build-stamp: configure-stamp
rm -rf Rules.make rm -rf Rules.make
ln -s Rules.make.system Rules.make ln -s Rules.make.system Rules.make
echo "2" | ./configure.sh echo "2" | ./configure.sh
$(MAKE) PREFIX=/usr BIN=/usr/games STEADPATH=/usr/share/games/instead $(MAKE) PREFIX=/usr BIN=/usr/games DATAPATH=/usr/share/games/instead
rm -rf Rules.make rm -rf Rules.make
#docbook-to-man debian/instead.sgml > instead.1 #docbook-to-man debian/instead.sgml > instead.1
touch $@ touch $@
@ -58,7 +58,7 @@ install: build
# Add here commands to install the package into debian/instead. # Add here commands to install the package into debian/instead.
rm -rf Rules.make rm -rf Rules.make
ln -s Rules.make.system Rules.make ln -s Rules.make.system Rules.make
$(MAKE) install DESTDIR=$(CURDIR)/debian/instead PREFIX=/usr STEADPATH=$(CURDIR)/debian/instead/usr/share/games/instead BIN=$(CURDIR)/debian/instead/usr/games $(MAKE) install DESTDIR=$(CURDIR)/debian/instead PREFIX=/usr DATAPATH=$(CURDIR)/debian/instead/usr/share/games/instead BIN=$(CURDIR)/debian/instead/usr/games
rm -rf Rules.make rm -rf Rules.make