Mesa (master): targets/gbm: Fix install path

[Benjamin Franzke]

Module: Mesa
Branch: master
Commit: 468c7ea2acd1ef07973af0dc23ff994691f0a9b7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=468c7ea2acd1ef07973af0dc23ff994691f0a9b7

Author: Benjamin Franzke <benjaminfranzke at googlemail.com>
Date:   Tue Jan 24 10:12:59 2012 +0100

targets/gbm: Fix install path

GBM_BACKEND_INSTALL_DIR was deleted by commit
06ad64ad29e7aa9e2d001f6bd1f8c1c1f77050b8.
Since we dont need this configurable, use $(INSTALL_LIB_DIR)/gbm now.

---

 src/gallium/targets/gbm/Makefile   |    6 +++---
 src/gbm/backends/Makefile.template |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gallium/targets/gbm/Makefile b/src/gallium/targets/gbm/Makefile
index 89fddfe..ce56f93 100644
--- a/src/gallium/targets/gbm/Makefile
+++ b/src/gallium/targets/gbm/Makefile
@@ -25,7 +25,7 @@ GBM_LIBS = $(LIBUDEV_LIBS) $(LIBDRM_LIB) -lm \
 
 
 GBM_CFLAGS = \
-	     -DGBM_BACKEND_SEARCH_DIR=\"$(GBM_BACKEND_INSTALL_DIR)\" \
+	     -DGBM_BACKEND_SEARCH_DIR=\"$(INSTALL_LIB_DIR)/gbm\" \
 	     -DPIPE_PREFIX=\"$(PIPE_PREFIX)\" \
 	     $(LIBUDEV_CFLAGS) \
 	     $(LIBDRM_CFLAGS)  
@@ -169,9 +169,9 @@ $(pipe_OBJECTS): %.o: %.c
 	$(CC) -c -o $@ $< $(pipe_INCLUDES) $(pipe_CFLAGS) $(CFLAGS)
 
 install-pipes: $(GBM_EXTRA_TARGETS)
-	$(INSTALL) -d $(DESTDIR)$(GBM_BACKEND_INSTALL_DIR)
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/gbm
 	for tgt in $(GBM_EXTRA_TARGETS); do \
-		$(MINSTALL) "$$tgt" $(DESTDIR)$(GBM_BACKEND_INSTALL_DIR); \
+		$(MINSTALL) "$$tgt" $(DESTDIR)$(INSTALL_LIB_DIR)/gbm; \
 	done
 
 clean-pipes:
diff --git a/src/gbm/backends/Makefile.template b/src/gbm/backends/Makefile.template
index eba1dd7..448dd77 100644
--- a/src/gbm/backends/Makefile.template
+++ b/src/gbm/backends/Makefile.template
@@ -34,8 +34,8 @@ $(GBM_BACKEND).so: $(GBM_OBJECTS) Makefile $(TOP)/src/gbm/backends/Makefile.temp
 	$(CC) -c $(GBM_INCLUDES) $(CFLAGS) $(GBM_CFLAGS) $< -o $@
 
 install-so: $(GBM_BACKEND_PATH)
-	$(INSTALL) -d $(DESTDIR)$(GBM_BACKEND_INSTALL_DIR)
-	$(MINSTALL) $(GBM_BACKEND_PATH) $(DESTDIR)$(GBM_BACKEND_INSTALL_DIR)
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/gbm
+	$(MINSTALL) $(GBM_BACKEND_PATH) $(DESTDIR)$(INSTALL_LIB_DIR)/gbm
 
 install: $(GBM_INSTALL) $(GBM_EXTRA_INSTALL)