Makefile: Allow overriding directories without having to know the DESTDIR

diff --git a/Makefile b/Makefile
index ae7bb2e0ed842f19520195caeb848a7bf519b255..7c58571e6d3a13e20e7204a74371168190085467 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,25 +3,31 @@ PREFIX := /usr
 USE_SYSTEMD ?= 1
 USE_NFTABLES ?= 0
 
 USE_SYSTEMD ?= 1
 USE_NFTABLES ?= 0
 

-WAYDROID_DIR := $(DESTDIR)$(PREFIX)/lib/waydroid
-BIN_DIR := $(DESTDIR)$(PREFIX)/bin
-APPS_DIR := $(DESTDIR)$(PREFIX)/share/applications
-METAINFO_DIR := $(DESTDIR)$(PREFIX)/share/metainfo
-SYSD_DIR := $(DESTDIR)$(PREFIX)/lib/systemd/system
+WAYDROID_DIR := $(PREFIX)/lib/waydroid
+BIN_DIR := $(PREFIX)/bin
+APPS_DIR := $(PREFIX)/share/applications
+METAINFO_DIR := $(PREFIX)/share/metainfo
+SYSD_DIR := $(PREFIX)/lib/systemd/system
+
+INSTALL_WAYDROID_DIR := $(DESTDIR)$(WAYDROID_DIR)
+INSTALL_BIN_DIR := $(DESTDIR)$(BIN_DIR)
+INSTALL_APPS_DIR := $(DESTDIR)$(APPS_DIR)
+INSTALL_METAINFO_DIR := $(DESTDIR)$(METAINFO_DIR)
+INSTALL_SYSD_DIR := $(DESTDIR)$(SYSD_DIR)

 
 build:
        @echo "Nothing to build, run 'make install' to copy the files!"
 
 install:
 
 build:
        @echo "Nothing to build, run 'make install' to copy the files!"
 
 install:

-       install -d $(WAYDROID_DIR) $(BIN_DIR) $(APPS_DIR) $(METAINFO_DIR)
-       cp -a data tools waydroid.py $(WAYDROID_DIR)
-       ln -srf $(WAYDROID_DIR)/waydroid.py $(BIN_DIR)/waydroid
-       mv $(WAYDROID_DIR)/data/*.desktop $(APPS_DIR)
-       mv $(WAYDROID_DIR)/data/*.metainfo.xml $(METAINFO_DIR)
+       install -d $(INSTALL_WAYDROID_DIR) $(INSTALL_BIN_DIR) $(INSTALL_APPS_DIR) $(INSTALL_METAINFO_DIR)
+       cp -a data tools waydroid.py $(INSTALL_WAYDROID_DIR)
+       ln -srf $(INSTALL_WAYDROID_DIR)/waydroid.py $(INSTALL_BIN_DIR)/waydroid
+       mv $(INSTALL_WAYDROID_DIR)/data/*.desktop $(INSTALL_APPS_DIR)
+       mv $(INSTALL_WAYDROID_DIR)/data/*.metainfo.xml $(INSTALL_METAINFO_DIR)

        if [ $(USE_SYSTEMD) = 1 ]; then \
        if [ $(USE_SYSTEMD) = 1 ]; then \

-               install -d $(SYSD_DIR); \
-               cp systemd/waydroid-container.service $(SYSD_DIR); \
+               install -d $(INSTALL_SYSD_DIR); \
+               cp systemd/waydroid-container.service $(INSTALL_SYSD_DIR); \

        fi
        if [ $(USE_NFTABLES) = 1 ]; then \
        fi
        if [ $(USE_NFTABLES) = 1 ]; then \

-               sed '/LXC_USE_NFT=/ s/false/true/' -i $(WAYDROID_DIR)/data/scripts/waydroid-net.sh; \
+               sed '/LXC_USE_NFT=/ s/false/true/' -i $(INSTALL_WAYDROID_DIR)/data/scripts/waydroid-net.sh; \

        fi
        fi