[yosys] 48/57: Using DESTDIR correctly

[Ruben Undheim]

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

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

commit 9587d4b01795a52090134c61ebb3ab0a9b604972
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Sep 14 10:22:52 2014 +0200

    Using DESTDIR correctly
---
 debian/install                      | 10 ----------
 debian/patches/04_installpath.patch | 19 +++++++++++++++++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/debian/install b/debian/install
deleted file mode 100644
index 0e8effb..0000000
--- a/debian/install
+++ /dev/null
@@ -1,10 +0,0 @@
-yosys usr/bin
-yosys-filterlib usr/bin
-yosys-config usr/bin
-share/simcells.v usr/share/yosys
-share/xilinx/cells.v usr/share/yosys/xilinx
-share/techmap.v usr/share/yosys
-share/simlib.v usr/share/yosys
-share/pmux2mux.v usr/share/yosys
-share/blackbox.v usr/share/yosys
-
diff --git a/debian/patches/04_installpath.patch b/debian/patches/04_installpath.patch
index 385e630..0e2b126 100644
--- a/debian/patches/04_installpath.patch
+++ b/debian/patches/04_installpath.patch
@@ -4,8 +4,8 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: yosys/Makefile
 ===================================================================
---- yosys.orig/Makefile	2014-09-14 09:31:33.000000000 +0200
-+++ yosys/Makefile	2014-09-14 09:32:14.370546709 +0200
+--- yosys.orig/Makefile	2014-09-14 10:15:11.298574348 +0200
++++ yosys/Makefile	2014-09-14 10:15:33.618574588 +0200
 @@ -14,7 +14,7 @@
  # other configuration flags
  ENABLE_GPROF := 0
@@ -15,3 +15,18 @@ Index: yosys/Makefile
  INSTALL_SUDO :=
  
  OBJS =
+@@ -263,10 +263,10 @@
+ 	@echo ""
+ 
+ install: $(TARGETS) $(EXTRA_TARGETS)
+-	$(INSTALL_SUDO) mkdir -p $(DESTDIR)/bin
+-	$(INSTALL_SUDO) install $(TARGETS) $(DESTDIR)/bin/
+-	$(INSTALL_SUDO) mkdir -p $(DESTDIR)/share/yosys
+-	$(INSTALL_SUDO) cp -r share/. $(DESTDIR)/share/yosys/.
++	$(INSTALL_SUDO) mkdir -p $(DESTDIR)/usr/bin
++	$(INSTALL_SUDO) install $(TARGETS) $(DESTDIR)/usr/bin/
++	$(INSTALL_SUDO) mkdir -p $(DESTDIR)/usr/share/yosys
++	$(INSTALL_SUDO) cp -r share/. $(DESTDIR)/usr/share/yosys/.
+ 
+ manual: $(TARGETS) $(EXTRA_TARGETS)
+ 	cd manual && bash appnotes.sh

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