From 9b2f256b637127f8c90c9d3eaf4610836b493021 Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Tue, 19 Mar 2019 15:25:03 +0100 Subject: [PATCH] 3rdparty/Makefile: PKG_CONFIG_PATH => PKG_CONFIG_LIBDIR PKG_CONFIG_PATH add path to the default, PKG_CONFIG_LIBDIR replace the default paths --- 3rdparty/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdparty/Makefile b/3rdparty/Makefile index 5699b769..aab65874 100644 --- a/3rdparty/Makefile +++ b/3rdparty/Makefile @@ -301,7 +301,7 @@ $(PREFIX)/lib/libSDL2_image.a: $(PREFIX)/lib/libpng.a $(PREFIX)/lib/libSDL2_image.a: $(PREFIX)/lib/libSDL2main.a $(PREFIX)/lib/libSDL2_image.a: $(SDL2IMAGE)/.ok - cd $(SDL2IMAGE) && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig \ + cd $(SDL2IMAGE) && PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \ CC="$(CC) $(LDFLAGS)" CPPFLAGS=-I$(PREFIX)/include LDFLAGS="-L$(PREFIX)/lib" \ ./configure --prefix=$(PREFIX) --host=$(HOST) --disable-sdltest \ --disable-webp --disable-imageio \ @@ -324,7 +324,7 @@ $(PREFIX)/lib/libSDL2_ttf.a: $(PREFIX)/lib/libfreetype.a $(PREFIX)/lib/libSDL2_ttf.a: $(PREFIX)/lib/libSDL2main.a $(PREFIX)/lib/libSDL2_ttf.a: $(SDL2TTF)/.ok - cd $(SDL2TTF) && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig \ + cd $(SDL2TTF) && PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \ CC=$(CC) CPPFLAGS=-I$(PREFIX)/include LDFLAGS="-L$(PREFIX)/lib $(LDFLAGS)" \ ./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) \ --with-freetype-prefix=$(PREFIX) --host=$(HOST) @@ -435,7 +435,7 @@ $(PREFIX)/lib/libSDL_ttf.a: $(SDLTTF)/.ok ifdef WIN32 $(CP) $(PREFIX)/bin/SDL.dll $(SDLTTF) endif - cd $(SDLTTF) && PKG_CONFIG_PATH=$(PREFIX)/lib/pkgconfig \ + cd $(SDLTTF) && PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \ CC=$(CC) CPPFLAGS=-I$(PREFIX)/include LDFLAGS="-L$(PREFIX)/lib $(LDFLAGS) $(ADDLDFLAGS)" \ ./configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) --with-freetype-prefix=$(PREFIX) \ --host=$(HOST)