Ticket #70123: Makefile.diff

File Makefile.diff, 784 bytes (added by contextnerror, 5 months ago)

  • Makefile

    old new  
    1010# User-definable stuff:
    1111
    1212CC=gcc
    13 PREFIX=/usr/local
     13PREFIX?=/usr/local
    1414MAN_PREFIX=$(PREFIX)
    1515BIN_PREFIX=$(PREFIX)/bin
    1616DATA_PREFIX=$(PREFIX)/share/defendguin/
    17 JOY=YES
     17JOY?=YES
    1818EXTRA_LIBS= # override, e.g., with "-lbe" for Haiku
    1919
    2020
    2121# Other definitions:
    2222
    2323SDL_CFLAGS := $(shell sdl-config --cflags)
    24 SDL_LDFLAGS := $(shell sdl-config --libs) -L/usr/X11R6/lib
     24SDL_LDFLAGS := $(shell sdl-config --libs)
    2525MIXER=-lSDL_mixer
    2626NOSOUNDFLAG=__SOUND
    27 CFLAGS=-Wall $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) \
     27CFLAGS+=-Wall $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) \
    2828        -DJOY_$(JOY)
    2929SDL_LIB=$(SDL_LDFLAGS) $(MIXER)
    3030