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.

diff --git a/src/gallium/targets/gbm/Makefile b/src/gallium/targets/gbm/Makefile
index 89fddfe9a7bfaea466d58d811c3cf69ff407af20..ce56f934972bd0e090783c34945aa44602ca62a8 100644 (file)
--- 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 eba1dd7e45386680bac766f05c748f31382bb79c..448dd77d9643bd1b162643d3ec7dd6b2e6440ce6 100644 (file)
--- 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)