[icestorm] 15/75: Define and use DESTDIR for installation (by Larry Doolittle)

Ruben Undheim rubund-guest at moszumanska.debian.org
Wed Oct 7 15:52:04 UTC 2015


This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository icestorm.

commit 83a24ddc444a90bca9697c0c2f057c84dc24e1b4
Author: Clifford Wolf <clifford at clifford.at>
Date:   Mon Jul 27 22:40:45 2015 +0200

    Define and use DESTDIR for installation (by Larry Doolittle)
---
 icebox/Makefile  | 45 +++++++++++++++++++++++----------------------
 icepack/Makefile |  9 +++++----
 iceprog/Makefile |  5 +++--
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/icebox/Makefile b/icebox/Makefile
index 7cfb5ce..f3e2911 100644
--- a/icebox/Makefile
+++ b/icebox/Makefile
@@ -1,3 +1,4 @@
+DESTDIR = /usr/local
 
 all: chipdb-1k.txt chipdb-8k.txt
 
@@ -14,30 +15,30 @@ clean:
 	rm -f icebox.pyc iceboxdb.pyc
 
 install: all
-	mkdir -p /usr/local/share/icebox
-	cp chipdb-1k.txt     /usr/local/share/icebox/
-	cp chipdb-8k.txt     /usr/local/share/icebox/
-	cp icebox.py         /usr/local/bin/icebox.py
-	cp iceboxdb.py       /usr/local/bin/iceboxdb.py
-	cp icebox_chipdb.py  /usr/local/bin/icebox_chipdb
-	cp icebox_diff.py    /usr/local/bin/icebox_diff
-	cp icebox_explain.py /usr/local/bin/icebox_explain
-	cp icebox_html.py    /usr/local/bin/icebox_html
-	cp icebox_maps.py    /usr/local/bin/icebox_maps
-	cp icebox_vlog.py    /usr/local/bin/icebox_vlog
+	mkdir -p $(DESTDIR)/share/icebox
+	cp chipdb-1k.txt     $(DESTDIR)/share/icebox/
+	cp chipdb-8k.txt     $(DESTDIR)/share/icebox/
+	cp icebox.py         $(DESTDIR)/bin/icebox.py
+	cp iceboxdb.py       $(DESTDIR)/bin/iceboxdb.py
+	cp icebox_chipdb.py  $(DESTDIR)/bin/icebox_chipdb
+	cp icebox_diff.py    $(DESTDIR)/bin/icebox_diff
+	cp icebox_explain.py $(DESTDIR)/bin/icebox_explain
+	cp icebox_html.py    $(DESTDIR)/bin/icebox_html
+	cp icebox_maps.py    $(DESTDIR)/bin/icebox_maps
+	cp icebox_vlog.py    $(DESTDIR)/bin/icebox_vlog
 
 uninstall:
-	rm -f /usr/local/bin/icebox.py
-	rm -f /usr/local/bin/iceboxdb.py
-	rm -f /usr/local/bin/icebox_chipdb
-	rm -f /usr/local/bin/icebox_diff
-	rm -f /usr/local/bin/icebox_explain
-	rm -f /usr/local/bin/icebox_html
-	rm -f /usr/local/bin/icebox_maps
-	rm -f /usr/local/bin/icebox_vlog
-	rm -f /usr/local/share/icebox/chipdb-1k.txt
-	rm -f /usr/local/share/icebox/chipdb-8k.txt
-	-rmdir /usr/local/share/icebox
+	rm -f $(DESTDIR)/bin/icebox.py
+	rm -f $(DESTDIR)/bin/iceboxdb.py
+	rm -f $(DESTDIR)/bin/icebox_chipdb
+	rm -f $(DESTDIR)/bin/icebox_diff
+	rm -f $(DESTDIR)/bin/icebox_explain
+	rm -f $(DESTDIR)/bin/icebox_html
+	rm -f $(DESTDIR)/bin/icebox_maps
+	rm -f $(DESTDIR)/bin/icebox_vlog
+	rm -f $(DESTDIR)/share/icebox/chipdb-1k.txt
+	rm -f $(DESTDIR)/share/icebox/chipdb-8k.txt
+	-rmdir $(DESTDIR)/share/icebox
 
 .PHONY: all clean install uninstall
 
diff --git a/icepack/Makefile b/icepack/Makefile
index 18398f3..6f908a4 100644
--- a/icepack/Makefile
+++ b/icepack/Makefile
@@ -2,6 +2,7 @@
 LDLIBS = -lm -lstdc++
 CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11
 CC = $(CXX)
+DESTDIR = /usr/local
 
 all: icepack iceunpack
 
@@ -11,12 +12,12 @@ iceunpack: icepack
 	ln -sf icepack iceunpack
 
 install: all
-	cp icepack /usr/local/bin/icepack
-	ln -sf icepack /usr/local/bin/iceunpack
+	cp icepack $(DESTDIR)/bin/icepack
+	ln -sf icepack $(DESTDIR)/bin/iceunpack
 
 uninstall:
-	rm -f /usr/local/bin/icepack
-	rm -f /usr/local/bin/iceunpack
+	rm -f $(DESTDIR)/bin/icepack
+	rm -f $(DESTDIR)/bin/iceunpack
 
 clean:
 	rm -f icepack
diff --git a/iceprog/Makefile b/iceprog/Makefile
index b0d735a..86c69f4 100644
--- a/iceprog/Makefile
+++ b/iceprog/Makefile
@@ -1,16 +1,17 @@
 # CC = clang
 LDLIBS = -lftdi -lm
 CFLAGS = -MD -O0 -ggdb -Wall -std=c99
+DESTDIR = /usr/local
 
 all: iceprog
 
 iceprog: iceprog.o
 
 install: all
-	cp iceprog /usr/local/bin/iceprog
+	cp iceprog $(DESTDIR)/bin/iceprog
 
 uninstall:
-	rm -f /usr/local/bin/iceprog
+	rm -f $(DESTDIR)/bin/iceprog
 
 clean:
 	rm -f iceprog

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/icestorm.git



More information about the debian-science-commits mailing list