* configure fixes

This commit is contained in:
tlh2000 2009-05-23 12:58:38 +00:00
parent 946136a60f
commit b6af64559e
2 changed files with 14 additions and 13 deletions

View file

@ -17,9 +17,9 @@ MAKE=make
# Prefix for 'make install'
PREFIX=@PREFIX@
STRATAGUS_LIB_PATH=@STRATAGUS_LIB_PATH@
PKGDATADIR=@PKGDATADIR@
CPPFLAGS=@DEFS@ @CPPFLAGS@ -DUSE_ZLIB -I$(TOPDIR) -I$(TOPDIR)/src/include -I$(TOPDIR)/src/guichan/include -DSTRATAGUS_LIB_PATH="\"@STRATAGUS_LIB_PATH@\""
CPPFLAGS=@DEFS@ @CPPFLAGS@ -DUSE_ZLIB -I$(TOPDIR) -I$(TOPDIR)/src/include -I$(TOPDIR)/src/guichan/include -DSTRATAGUS_LIB_PATH="\"@PKGDATADIR@\""
CXXFLAGS=@CXXFLAGS@
LDFLAGS=@LDFLAGS@ -lpng -lz -lm

View file

@ -231,19 +231,20 @@ else
LDFLAGS="$LDFLAGS `$SDLCONFIG --static-libs`"
fi
test "$prefix" = "NONE" && prefix=/usr/local
datarootdir=.
test "$datadir" = "NONE" && datadir=$datarootdir
if test "$datadir" = "NONE"; then
STRATAGUS_LIB_PATH="."
else
STRATAGUS_LIB_PATH="$datadir"
fi
AC_SUBST(STRATAGUS_LIB_PATH)
eval PKGDATADIR="$datadir"
AC_DEFINE_UNQUOTED(PKGDATADIR, "$PKGDATADIR",
[Define this to the path containing the game data.]
)
AC_SUBST(PKGDATADIR)
if test "$prefix" = "NONE"; then
PREFIX=/usr/local
else
PREFIX="$prefix"
fi
eval PREFIX="$prefix"
AC_DEFINE_UNQUOTED(PREFIX, "$PREFIX",
[Define this to the prefix of the path to install stratagus to.]
)
AC_SUBST(PREFIX)
if test "$ARCH" = "win32"; then