4 files changed, 5 insertions, 3 deletions
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 25fb3c50bd6..57fb691ea9d 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -77,7 +77,6 @@ INCLUDE_DIRS += $(WAYLAND_CFLAGS)
 endif
 ifneq ($(findstring drm, $(EGL_PLATFORMS)),)
 EGL_LIB_DEPS += -lgbm
-LDFLAGS += -L$(TOP)/src/gbm/.libs
 INCLUDE_DIRS += -I$(TOP)/src/gbm/main
 endif
 
diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile
index 92b72665f10..9e8777402cb 100644
--- a/src/gallium/targets/egl-static/Makefile
+++ b/src/gallium/targets/egl-static/Makefile
@@ -58,7 +58,6 @@ endif
 ifneq ($(findstring drm, $(EGL_PLATFORMS)),)
 egl_CPPFLAGS += $(LIBDRM_CFLAGS)
 egl_SYS += $(LIBDRM_LIB) -lgbm
-LDFLAGS += -L$(TOP)/src/gbm/.libs
 endif
 ifneq ($(findstring fbdev, $(EGL_PLATFORMS)),)
 egl_LIBS += $(TOP)/src/gallium/winsys/sw/fbdev/libfbdev.a
diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index f874f6411a3..d18d35c4e39 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -32,3 +32,7 @@ libgbm_dri_la_CFLAGS = \
 
 libgbm_la_LIBADD = libgbm_dri.la
 endif
+
+all-local: libgbm.la
+	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+	ln -f .libs/libgbm.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libgbm.so
diff --git a/src/gbm/backends/Makefile.template b/src/gbm/backends/Makefile.template
index 448dd77d964..1c8f924909e 100644
--- a/src/gbm/backends/Makefile.template
+++ b/src/gbm/backends/Makefile.template
@@ -26,7 +26,7 @@ $(GBM_BACKEND_PATH): $(GBM_BACKEND).so
 
 $(GBM_BACKEND).so: $(GBM_OBJECTS) Makefile $(TOP)/src/gbm/backends/Makefile.template
 	@$(MKLIB) -o $(GBM_BACKEND).so -noprefix \
-		-linker '$(CC)' -ldflags '-L$(TOP)/src/gbm/.libs $(LDFLAGS)' \
+		-linker '$(CC)' -ldflags '-L$(TOP)/$(LIB_DIR) $(LDFLAGS)' \
 		$(MKLIB_OPTIONS) \
 		$(GBM_OBJECTS) $(GBM_LIBS) -lgbm