Changeset 623


Ignore:
Timestamp:
May 9, 2011, 3:19:59 AM (6 years ago)
Author:
sam
Message:

build: fix a problem with --with-assetdir and make sure the flag
name does not have an `s'.

Location:
abuse/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/PACKAGERS

    r622 r623  
    1717value, this expands to /usr/local/share/games/abuse.
    1818
    19 To override the assets directory, use the `--with-assetsdir' configure flag,
     19To override the assets directory, use the `--with-assetdir' configure flag,
    2020for instance:
    2121
    22     ./configure --with-assetsdir=/opt/abuse
     22    ./configure --with-assetdir=/opt/abuse
    2323
    2424
  • abuse/trunk/configure.ac

    r614 r623  
    2727  [  --disable-nonfree       disable non-free data (default no)])
    2828
    29 AC_ARG_WITH(assetsdir,
    30   [  --with-assetsdir=DIR    override default game data directory])
     29AC_ARG_WITH(assetdir,
     30  [  --with-assetdir=DIR     override default game data directory])
    3131
    3232dnl  Figure out where the datafiles will be
    33 if test "x${with_assetsdir}" = x; then
    34   with_assetsdir='$(datadir)/games/abuse'
     33if test "x${with_assetdir}" = x; then
     34  with_assetdir='$(datadir)/games/abuse'
    3535fi
    36 AC_SUBST([assetsdir], [$with_assetsdir])
     36AC_SUBST([assetdir], [$with_assetdir])
    3737
    3838dnl  Checks for libraries
     
    146146    Compiler:          ${CC} (`${CC} --version | head -n 1`)
    147147    Install prefix:    ${prefix}
    148     Assets directory:  ${with_assetsdir}
     148    Asset directory:   ${with_assetdir}
    149149    SDL version:       `sdl-config --version`
    150150    OpenGL support:    ${have_opengl}
  • abuse/trunk/data/Makefile.am

    r614 r623  
    66        @for p in $(EXTRA_DIST); do \
    77          d="`echo \"$$p\" | sed -ne 's@\(.*\)/.*@\1@p'`"; \
    8           $(MKDIR_P) "$(DESTDIR)$(assetsdir)/$$d"; \
    9           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(assetsdir)/$$d"; \
    10           $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(assetsdir)/$$d" || exit $$?; \
     8          $(MKDIR_P) "$(DESTDIR)$(assetdir)/$$d"; \
     9          echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(assetdir)/$$d"; \
     10          $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(assetdir)/$$d" || exit $$?; \
    1111        done
    1212
    1313uninstall-local:
    1414        @for p in $(EXTRA_DIST); do \
    15           echo " ( cd '$(DESTDIR)$(assetsdir)' && rm -f" $$p ")"; \
    16           cd "$(DESTDIR)$(assetsdir)" && rm -f $$p; \
     15          echo " ( cd '$(DESTDIR)$(assetdir)' && rm -f" $$p ")"; \
     16          cd "$(DESTDIR)$(assetdir)" && rm -f $$p; \
    1717        done
    1818
  • abuse/trunk/src/sdlport/Makefile.am

    r614 r623  
    1919INCLUDES = -I$(srcdir)/../ -I$(srcdir)/../imlib $(SDL_CFLAGS)
    2020
    21 CPPFLAGS = @CPPFLAGS@ -DNO_CHECK -DASSETSDIR=\"$(datadir)/games/abuse\"
     21CPPFLAGS = @CPPFLAGS@ -DNO_CHECK -DASSETDIR=\"$(assetdir)\"
    2222
  • abuse/trunk/src/sdlport/setup.cpp

    r614 r623  
    102102        fputs( "; Use OpenGL\ngl=0\n\n", fd );
    103103        fputs( "; Location of the datafiles\ndatadir=", fd );
    104         fputs( ASSETSDIR "\n\n", fd );
     104        fputs( ASSETDIR "\n\n", fd );
    105105        #endif
    106106        fputs( "; Use mono audio only\nmono=0\n\n", fd );
     
    430430        set_filename_prefix( (const char*)buffer );
    431431    #else
    432     set_filename_prefix( ASSETSDIR );
     432    set_filename_prefix( ASSETDIR );
    433433    #endif
    434434
Note: See TracChangeset for help on using the changeset viewer.