Changeset 614 for abuseTweet

Timestamp:

May 9, 2011, 12:55:14 AM (12 years ago)

Author:

Sam Hocevar

Message:

build: add a `--with-assetsdir' configure flag to specify where the
game data should be installed.

Location:

abuse/trunk

Files:

• PACKAGERS (modified) (1 diff)
• configure.ac (modified) (4 diffs)
• data/Makefile.am (modified) (1 diff)
• src/sdlport/Makefile.am (modified) (2 diffs)
• src/sdlport/setup.cpp (modified) (3 diffs)

abuse/trunk/PACKAGERS

@@ -12 +12 @@
 
 
-2.) Data directory
+2.) Assets directory
 
-The default data directory is ${prefix}/share/games/abuse. With the default
-prefix value, this expands to /usr/local/share/games/abuse.
+The default assets directory is ${datadir}/games/abuse. With the default prefix
+value, this expands to /usr/local/share/games/abuse.
+
+To override the assets directory, use the `--with-assetsdir' configure flag,
+for instance:
+
+    ./configure --with-assetsdir=/opt/abuse
 
 

abuse/trunk/configure.ac

@@ -20 +20 @@
 fi
 
-dnl Figure out where the datafiles will be
-EXPDATADIR="-DEXPDATADIR=\\\"$datadir/games/abuse\\\""
-AC_SUBST(EXPDATADIR)
-
 AC_ARG_ENABLE(debug,
   [  --enable-debug          build debug versions of the game (default no)])
@@ -31 +27 @@
   [  --disable-nonfree       disable non-free data (default no)])
 
-dnl Checks for libraries
+AC_ARG_WITH(assetsdir,
+  [  --with-assetsdir=DIR    override default game data directory])
+
+dnl  Figure out where the datafiles will be
+if test "x${with_assetsdir}" = x; then
+  with_assetsdir='$(datadir)/games/abuse'
+fi
+AC_SUBST([assetsdir], [$with_assetsdir])
+
+dnl  Checks for libraries
 dnl Do we need to link against something for X shared memory support?
-AC_CHECK_LIB(Xext,XShmAttach,:,[
-AC_CHECK_LIB(XextSam,XShmAttach,LIBS="$LIBS -lXextSam",,$X_LIBS -lX11 -lXext)
-],$X_LIBS -lX11)
+AC_CHECK_LIB(Xext, XShmAttach, :,
+             [AC_CHECK_LIB(XextSam, XShmAttach, LIBS="$LIBS -lXextSam", :,
+                           $X_LIBS -lX11 -lXext)],
+             $X_LIBS -lX11)
 
 dnl Checks for Solaris compatibility
-AC_CHECK_LIB(m,pow,LIBS="$LIBS -lm")
-AC_CHECK_LIB(socket,socket,LIBS="$LIBS -lsocket")
-AC_CHECK_LIB(nsl,gethostbyname,LIBS="$LIBS -lnsl")
+AC_CHECK_LIB(m, pow, LIBS="$LIBS -lm")
+AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
+AC_CHECK_LIB(nsl, gethostbyname, LIBS="$LIBS -lnsl")
 
 dnl Check for SDL
@@ -114 +120 @@
     #else
     #include <GL/gl.h>
-    #endif
-],[
-],[
-have_opengl=yes
-])
+    #endif],
+  [],
+  [have_opengl=yes])
 AC_MSG_RESULT($have_opengl)
-if test x$have_opengl = xyes; then
+if test "x$have_opengl" = xyes; then
     CFLAGS="$CFLAGS -DHAVE_OPENGL"
     CXXFLAGS="$CXXFLAGS -DHAVE_OPENGL"
@@ -140 +144 @@
 echo "
 ------ Configuration for $PACKAGE $VERSION ------
-    Compiler:         ${CC} (version `${CC} --version`)
-    Install prefix:   $prefix
-    SDL version:      `sdl-config --version`
-    OpenGL support:   $have_opengl
+    Compiler:          ${CC} (`${CC} --version | head -n 1`)
+    Install prefix:    ${prefix}
+    Assets directory:  ${with_assetsdir}
+    SDL version:       `sdl-config --version`
+    OpenGL support:    ${have_opengl}
 
 Now type 'make' to build $PACKAGE.

abuse/trunk/data/Makefile.am

@@ -2 +2 @@
 EXTRA_DIST = \
     $(demos) $(music) $(lisp) $(extra) $(art) $(levels) $(doc) $(sound)
-
-datafiledir = $(datadir)/games/abuse
 
 install-data-local:
         @for p in $(EXTRA_DIST); do \
           d="`echo \"$$p\" | sed -ne 's@\(.*\)/.*@\1@p'`"; \
-          $(MKDIR_P) "$(DESTDIR)$(datafiledir)/$$d"; \
-          echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(datafiledir)/$$d"; \
-          $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(datafiledir)/$$d" || exit $$?; \
+          $(MKDIR_P) "$(DESTDIR)$(assetsdir)/$$d"; \
+          echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(assetsdir)/$$d"; \
+          $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(assetsdir)/$$d" || exit $$?; \
         done
 
 uninstall-local:
         @for p in $(EXTRA_DIST); do \
-          echo " ( cd '$(DESTDIR)$(datafiledir)' && rm -f" $$p ")"; \
-          cd "$(DESTDIR)$(datafiledir)" && rm -f $$p; \
+          echo " ( cd '$(DESTDIR)$(assetsdir)' && rm -f" $$p ")"; \
+          cd "$(DESTDIR)$(assetsdir)" && rm -f $$p; \
         done
 

abuse/trunk/src/sdlport/Makefile.am

@@ -1 @@
-## Process this file with automake to produce Makefile.in
-DEFS = @DEFS@ @EXPDATADIR@
+
+DEFS = @DEFS@
 
 noinst_LIBRARIES = libsdlport.a
@@ -19 +19 @@
 INCLUDES = -I$(srcdir)/../ -I$(srcdir)/../imlib $(SDL_CFLAGS)
 
-CPPFLAGS = @CPPFLAGS@ -DNO_CHECK
+CPPFLAGS = @CPPFLAGS@ -DNO_CHECK -DASSETSDIR=\"$(datadir)/games/abuse\"
+

abuse/trunk/src/sdlport/setup.cpp

@@ -93 +93 @@
     if( (fd = fopen( rcfile, "w" )) != NULL )
     {
-        char datadir[255];
-        strncpy(datadir, EXPDATADIR, 255);
-
         fputs( "; Abuse-SDL Configuration file\n\n", fd );
         fputs( "; Startup fullscreen\nfullscreen=0\n\n", fd );
@@ -105 +102 @@
         fputs( "; Use OpenGL\ngl=0\n\n", fd );
         fputs( "; Location of the datafiles\ndatadir=", fd );
-        fputs( datadir, fd );
-        fputs( "\n\n", fd );
+        fputs( ASSETSDIR "\n\n", fd );
         #endif
         fputs( "; Use mono audio only\nmono=0\n\n", fd );
@@ -434 +430 @@
         set_filename_prefix( (const char*)buffer );
     #else
-    set_filename_prefix( EXPDATADIR );
+    set_filename_prefix( ASSETSDIR );
     #endif