diff options
| author | Benjamin Franzke <[email protected]> | 2012-01-24 10:12:59 +0100 |
|---|---|---|
| committer | Benjamin Franzke <[email protected]> | 2012-01-24 10:12:59 +0100 |
| commit | 468c7ea2acd1ef07973af0dc23ff994691f0a9b7 (patch) | |
| tree | 6bb6658c82d93031c04147843b7ff169962c8019 | |
| parent | ab52be68261bb6d2d27dab9fda40810022ba3475 (diff) | |
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.
| -rw-r--r-- | src/gallium/targets/gbm/Makefile | 6 | ||||
| -rw-r--r-- | 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 89fddfe9a7b..ce56f934972 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 eba1dd7e453..448dd77d964 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) |