[Pkg-electronics-commits] [pcb-rnd] 03/09: new upstream release allows install_root or DESTDIR to be used

[Bdale Garbee]

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

bdale pushed a commit to branch master
in repository pcb-rnd.

commit 1d244ebf42bfaafc728aa82e138433ae9b3a7845
Author: Bdale Garbee <bdale at gag.com>
Date:   Wed Feb 15 10:25:41 2017 -0700

    new upstream release allows install_root or DESTDIR to be used
---
 .../0002-renamed-install_root-DESTDIR.patch        | 112 ---------------------
 debian/patches/series                              |   1 -
 2 files changed, 113 deletions(-)

diff --git a/debian/patches/0002-renamed-install_root-DESTDIR.patch b/debian/patches/0002-renamed-install_root-DESTDIR.patch
deleted file mode 100644
index d6eacb3..0000000
--- a/debian/patches/0002-renamed-install_root-DESTDIR.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From: Dima Kogan <dima at secretsauce.net>
-Date: Sun, 18 Dec 2016 21:03:34 -0800
-Subject: renamed install_root -> DESTDIR
-
-This is more standard, and simplifies the packaging
----
- Makefile.conf.in                 | 12 ++++++------
- doc-rnd/gpmi_temp_inst.txt       |  4 ++--
- doc-rnd/packaging.txt            |  4 ++--
- src_3rd/liblihata/genht/Makefile |  4 ++--
- src_3rd/sphash/Makefile          |  6 +++---
- 5 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/Makefile.conf.in b/Makefile.conf.in
-index 66a8f95..30be5fd 100644
---- a/Makefile.conf.in
-+++ b/Makefile.conf.in
-@@ -1,11 +1,11 @@
- print [@# generated by ./configure, do not modify
- # prefix is @/local/prefix@
--DOCDIR=$(install_root)@/local/prefix@/share/doc/pcb-rnd
--LIBDIR=$(install_root)@/local/prefix@/lib/pcb-rnd
--BINDIR=$(install_root)@/local/prefix@/bin
--ETCDIR=$(install_root)/etc
--DATADIR=$(install_root)@/local/prefix@/share/pcb-rnd
--MAN1DIR=$(install_root)@/local/prefix@/share/man/man1
-+DOCDIR=$(DESTDIR)@/local/prefix@/share/doc/pcb-rnd
-+LIBDIR=$(DESTDIR)@/local/prefix@/lib/pcb-rnd
-+BINDIR=$(DESTDIR)@/local/prefix@/bin
-+ETCDIR=$(DESTDIR)/etc
-+DATADIR=$(DESTDIR)@/local/prefix@/share/pcb-rnd
-+MAN1DIR=$(DESTDIR)@/local/prefix@/share/man/man1
- RM=@/host/fstools/rm@
- CP=@/host/fstools/cp@
- LN=@/host/fstools/ln@
-diff --git a/doc-rnd/gpmi_temp_inst.txt b/doc-rnd/gpmi_temp_inst.txt
-index 68d1387..d99ca5e 100644
---- a/doc-rnd/gpmi_temp_inst.txt
-+++ b/doc-rnd/gpmi_temp_inst.txt
-@@ -22,7 +22,7 @@ There are options to step 6:
- 
- - if you want to check what it'd do, you could run this:
- 
--   install_root=/tmp/foo make install
-+   DESTDIR=/tmp/foo make install
- 
-    it's like DESTDIR for autotools: it will do everything but will use
-    /tmp/foo instead of / so you see what it'd do without using root or
-@@ -61,5 +61,5 @@ modifications (assuming you want to install gpmi in ~/usr):
- A/3. ./configure --prefix=~/usr
- B/2. ./configure --gpmi-prefix=~/usr
- 
--NOTE: you don't need to use install_root; gpmi will install under ~/usr as
-+NOTE: you don't need to use DESTDIR; gpmi will install under ~/usr as
- if it was /usr. 
-diff --git a/doc-rnd/packaging.txt b/doc-rnd/packaging.txt
-index 3df60c3..f86dd0e 100644
---- a/doc-rnd/packaging.txt
-+++ b/doc-rnd/packaging.txt
-@@ -48,13 +48,13 @@ by ./configure.
- 
- 3. typical ./configure options - scconfig vs. auto*
- 
--./configurfe --prefix works as expected. DESTDIR is called install_root.
-+./configurfe --prefix works as expected. DESTDIR is called "DESTDIR".
- 
- Typical commands for configuring pcb-rnd for packaging would be:
- 
-   ./configure --all=plugin --prefix=/usr
-   make all
--  install_root=/tmp/pkg_tmp make install
-+  DESTDIR=/tmp/pkg_tmp make install
- 
- We are happy with scconfig. Please don't write about how much better
- autoconf or cmake would be, we won't switch.
-diff --git a/src_3rd/liblihata/genht/Makefile b/src_3rd/liblihata/genht/Makefile
-index 8a30926..8be3c2f 100644
---- a/src_3rd/liblihata/genht/Makefile
-+++ b/src_3rd/liblihata/genht/Makefile
-@@ -1,6 +1,6 @@
- # use -Dinline if compiling with c89
--INCDIR=$(install_root)/usr/include/genht
--LIBDIR=$(install_root)/usr/lib
-+INCDIR=$(DESTDIR)/usr/include/genht
-+LIBDIR=$(DESTDIR)/usr/lib
- 
- CFLAGS=-Wall -pedantic -g
- 
-diff --git a/src_3rd/sphash/Makefile b/src_3rd/sphash/Makefile
-index 4a51819..5601aba 100644
---- a/src_3rd/sphash/Makefile
-+++ b/src_3rd/sphash/Makefile
-@@ -25,8 +25,8 @@ sphash: sphash.c
- 	$(CC) $(CFLAGS) $(LDFLAGS) sphash.c -o sphash
- 
- install_: sphash
--	mkdir -p $(install_root)/usr/bin/
--	$(CP) `pwd`/sphash $(install_root)/usr/bin/sphash
-+	mkdir -p $(DESTDIR)/usr/bin/
-+	$(CP) `pwd`/sphash $(DESTDIR)/usr/bin/sphash
- 
- install:
- 	$(MAKE) install_ CP=cp
-@@ -35,7 +35,7 @@ linstall:
- 	$(MAKE) install_ CP="ln -s"
- 
- uninstall:
--	rm $(install_root)/usr/bin/sphash
-+	rm $(DESTDIR)/usr/bin/sphash
- 
- deb:
- 	fakeroot debian/rules binary
diff --git a/debian/patches/series b/debian/patches/series
index c9f85e1..d2a17ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0002-renamed-install_root-DESTDIR.patch
 0003-I-use-the-CFLAGS-from-.-configure-CFLAGS.patch
 0004-gsch2pcb-uses-the-CFLAGS-LDFLAGS-from-.-configure.patch
 0005-docs-no-longer-load-images-from-the-internet.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/pcb-rnd.git