Commit 468c7ea2 authored by Benjamin Franzke's avatar Benjamin Franzke 😀
Browse files

targets/gbm: Fix install path

GBM_BACKEND_INSTALL_DIR was deleted by commit
06ad64ad.
Since we dont need this configurable, use $(INSTALL_LIB_DIR)/gbm now.
parent ab52be68
......@@ -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:
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment