Mercurial > mxe-octave
diff src/sdl_mixer.mk @ 3012:100e618349f7
Improve handling of prefix directories by defining HOST_PREFIX and
BUILD_TOOLS_PREFIX variables in top-level Makefile.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 02 Jun 2013 10:31:04 -0400 |
| parents | 47558e958113 |
| children | bcc26ffe9a0f |
line wrap: on
line diff
--- a/src/sdl_mixer.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/sdl_mixer.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,14 +20,14 @@ echo \ 'Libs.private:' \ "`$(TARGET)-pkg-config libmodplug --libs`" \ - "`$(PREFIX)/$(TARGET)/bin/smpeg-config --libs`" \ + "`$(HOST_PREFIX)/bin/smpeg-config --libs`" \ >> '$(1)/SDL_mixer.pc.in' $(SED) -i 's,for path in /usr/local; do,for path in; do,' '$(1)/configure' cd '$(1)' && ./configure \ --host='$(TARGET)' \ $(ENABLE_SHARED_OR_STATIC) \ - --prefix='$(PREFIX)/$(TARGET)' \ - --with-sdl-prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ + --with-sdl-prefix='$(HOST_PREFIX)' \ --disable-sdltest \ --disable-music-mod \ --enable-music-mod-modplug \ @@ -39,12 +39,12 @@ --disable-music-flac-shared \ --disable-music-mp3-shared \ --disable-smpegtest \ - --with-smpeg-prefix='$(PREFIX)/$(TARGET)' \ + --with-smpeg-prefix='$(HOST_PREFIX)' \ LIBS='-lvorbis -logg' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_mixer.exe' \ + '$(2).c' -o '$(HOST_PREFIX)/bin/test-sdl_mixer.exe' \ `'$(TARGET)-pkg-config' SDL_mixer --cflags --libs` endef