Improve makefile variable stability

flipflop97 · Feb 28, 2019 · 2b14444 · 2b14444
1 parent e037326
commit 2b14444
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/makefile b/makefile
@@ -4,7 +4,6 @@ BUILD_DIR ?= $(CURDIR)/build
 export BUILD_DIR
 
 INSTALL_DIR ?= $(XDG_DATA_HOME)/icons
-INSTALL_DIR := $(INSTALL_DIR)/Mato
 export INSTALL_DIR
 
 TEMP_DIR ?= /tmp
@@ -21,9 +20,9 @@ build:
 	$(MAKE) -C src
 
 install:
-	mkdir -p $(INSTALL_DIR)
-	rm -rf $(INSTALL_DIR)
-	cp -r $(BUILD_DIR) $(INSTALL_DIR)
+	mkdir -p $(INSTALL_DIR)/Mato
+	rm -rf $(INSTALL_DIR)/Mato
+	cp -r $(BUILD_DIR) $(INSTALL_DIR)/Mato
 
 clean:
 	rm -rf $(BUILD_DIR)

diff --git a/src/cursors/makefile b/src/cursors/makefile
@@ -18,3 +18,4 @@ $(BUILD_FILES):
 	rsvg-convert -w 96 -o $(TEMP_DIR)/$(LOCAL_DIR)/$@_96.png $@.svg
 	echo -e "24 2 2 $@_24.png\n48 4 4 $@_48.png\n72 6 6 $@_72.png\n96 8 8 $@_96.png" |\
 	xcursorgen -p $(TEMP_DIR)/$(LOCAL_DIR) - $(BUILD_DIR)/$(LOCAL_DIR)/$@
+
diff --git a/src/static/makefile b/src/static/makefile
@@ -7,3 +7,4 @@ copy:
 	cp -r full/ $(BUILD_DIR)
 	cp -r symbolic/ $(BUILD_DIR)
 	cp index.theme $(BUILD_DIR)
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ $(BUILD_FILES):
		rsvg-convert -w 96 -o $(TEMP_DIR)/$(LOCAL_DIR)/$@_96.png $@.svg
		echo -e "24 2 2 $@_24.png\n48 4 4 $@_48.png\n72 6 6 $@_72.png\n96 8 8 $@_96.png" \|\
		xcursorgen -p $(TEMP_DIR)/$(LOCAL_DIR) - $(BUILD_DIR)/$(LOCAL_DIR)/$@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ copy:
		cp -r full/ $(BUILD_DIR)
		cp -r symbolic/ $(BUILD_DIR)
		cp index.theme $(BUILD_DIR)