[jackhill/guix/guix.git] / gnu / packages / patches / ldns-drill-examples.patch

From 68916cd7ffb49ece9126d13ef984595595a156c4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 29 Jul 2020 12:32:48 -0400
Subject: [PATCH] [PATCH]: Split installation of drill and examples.

---
 Makefile.in | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 442067de..9d2d5f4d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,6 +14,10 @@ libdir		= @libdir@
 includedir	= @includedir@
 sysconfdir      = @sysconfdir@
 doxygen		= @doxygen@
+drillbindir = @drillbindir@
+drillmandir = @drillmandir@
+examplesbindir = @examplesbindir@
+examplesmandir = @examplesmandir@
 pywrapdir       = $(srcdir)/contrib/python
 pyldnsxwrapdir  = $(srcdir)/contrib/ldnsx
 p5_dns_ldns_dir = $(srcdir)/contrib/DNS-LDNS
@@ -154,16 +158,16 @@ drill/drill.1: $(srcdir)/drill/drill.1.in
 	$(edit) $(srcdir)/drill/drill.1.in > drill/drill.1
 
 install-drill: drill/drill drill/drill.1
-	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
-	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
-	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
-	$(LIBTOOL) --mode=install cp drill/drill $(DESTDIR)$(bindir)
-	$(INSTALL) -m 644 drill/drill.1 $(DESTDIR)$(mandir)/man1/drill.1
+	$(INSTALL) -m 755 -d $(drillbindir)
+	$(INSTALL) -m 755 -d $(drillmandir)
+	$(INSTALL) -m 755 -d $(drillmandir)/man1
+	$(LIBTOOL) --mode=install cp drill/drill $(drillbindir)
+	$(INSTALL) -m 644 drill/drill.1 $(drillmandir)/man1/drill.1
 
 uninstall-drill:
-	rm -f $(DESTDIR)$(bindir)/drill $(DESTDIR)$(mandir)/man1/drill.1
-	test ! -d $(DESTDIR)$(mandir) || rmdir -p $(DESTDIR)$(mandir)/man1 || :;
-	test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
+	rm -f $(drillbindir)/drill $(drillmandir)/man1/drill.1
+	test ! -d $(drillmandir) || rmdir -p $(drillmandir)/man1 || :;
+	test ! -d $(drillbindir) || rmdir -p $(drillbindir) || : ;
 
 clean-drill:
 	$(LIBTOOL) --mode clean rm -f $(DRILL_LOBJS) drill/drill drill/drill.1
@@ -202,23 +206,23 @@ examples/ldns-verify-zone.1: $(srcdir)/examples/ldns-verify-zone.1.in
 	$(edit) $(srcdir)/examples/ldns-verify-zone.1.in > examples/ldns-verify-zone.1
 
 install-examples: $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) examples/ldns-dane.1 examples/ldns-verify-zone.1
-	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
-	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
-	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+	$(INSTALL) -m 755 -d $(examplesbindir)
+	$(INSTALL) -m 755 -d $(examplesmandir)
+	$(INSTALL) -m 755 -d $(examplesmandir)/man1
 	for p in $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) ; do \
-		$(LIBTOOL) --mode=install cp $$p $(DESTDIR)$(bindir) ; \
+		$(LIBTOOL) --mode=install cp $$p $(examplesbindir) ; \
 		if test -f $$p.1 ; \
-		then $(INSTALL) -m 644 $$p.1 $(DESTDIR)$(mandir)/man1 ; \
-		else $(INSTALL) -m 644 $(srcdir)/$$p.1 $(DESTDIR)$(mandir)/man1 ; \
+		then $(INSTALL) -m 644 $$p.1 $(examplesmandir)/man1 ; \
+		else $(INSTALL) -m 644 $(srcdir)/$$p.1 $(examplesmandir)/man1 ; \
 		fi ; \
 	done
 
 uninstall-examples:
 	for p in $(EX_PROGS_BASENM) ; do \
-		rm -f $(DESTDIR)$(bindir)/$$p $(DESTDIR)$(mandir)/man1/$$p.1 ;\
+		rm -f $(examplesbindir)/$$p $(examplesmandir)/man1/$$p.1 ;\
 	done
-	test ! -d $(DESTDIR)$(mandir) || rmdir -p $(DESTDIR)$(mandir)/man1 || :;
-	test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
+	test ! -d $(examplesmandir) || rmdir -p $(examplesmandir)/man1 || :;
+	test ! -d $(examplesbindir) || rmdir -p $(examplesbindir) || : ;
 
 clean-examples:
 	$(LIBTOOL) --mode clean rm -f $(EXAMPLE_PROGS) 
-- 
2.27.0
Commit	Line	Data
6a7256fc RG	1	From 68916cd7ffb49ece9126d13ef984595595a156c4 Mon Sep 17 00:00:00 2001
	2	From: Raghav Gururajan <raghavgururajan@disroot.org>
	3	Date: Wed, 29 Jul 2020 12:32:48 -0400
	4	Subject: [PATCH] [PATCH]: Split installation of drill and examples.
	5
	6	---
	7	Makefile.in \| 38 +++++++++++++++++++++-----------------
	8	1 file changed, 21 insertions(+), 17 deletions(-)
	9
	10	diff --git a/Makefile.in b/Makefile.in
	11	index 442067de..9d2d5f4d 100644
	12	--- a/Makefile.in
	13	+++ b/Makefile.in
	14	@@ -14,6 +14,10 @@ libdir = @libdir@
	15	includedir = @includedir@
	16	sysconfdir = @sysconfdir@
	17	doxygen = @doxygen@
	18	+drillbindir = @drillbindir@
	19	+drillmandir = @drillmandir@
	20	+examplesbindir = @examplesbindir@
	21	+examplesmandir = @examplesmandir@
	22	pywrapdir = $(srcdir)/contrib/python
	23	pyldnsxwrapdir = $(srcdir)/contrib/ldnsx
	24	p5_dns_ldns_dir = $(srcdir)/contrib/DNS-LDNS
	25	@@ -154,16 +158,16 @@ drill/drill.1: $(srcdir)/drill/drill.1.in
	26	$(edit) $(srcdir)/drill/drill.1.in > drill/drill.1
	27
	28	install-drill: drill/drill drill/drill.1
	29	- $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
	30	- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
	31	- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
	32	- $(LIBTOOL) --mode=install cp drill/drill $(DESTDIR)$(bindir)
	33	- $(INSTALL) -m 644 drill/drill.1 $(DESTDIR)$(mandir)/man1/drill.1
	34	+ $(INSTALL) -m 755 -d $(drillbindir)
	35	+ $(INSTALL) -m 755 -d $(drillmandir)
	36	+ $(INSTALL) -m 755 -d $(drillmandir)/man1
	37	+ $(LIBTOOL) --mode=install cp drill/drill $(drillbindir)
	38	+ $(INSTALL) -m 644 drill/drill.1 $(drillmandir)/man1/drill.1
	39
	40	uninstall-drill:
	41	- rm -f $(DESTDIR)$(bindir)/drill $(DESTDIR)$(mandir)/man1/drill.1
	42	- test ! -d $(DESTDIR)$(mandir) \|\| rmdir -p $(DESTDIR)$(mandir)/man1 \|\| :;
	43	- test ! -d $(DESTDIR)$(bindir) \|\| rmdir -p $(DESTDIR)$(bindir) \|\| : ;
	44	+ rm -f $(drillbindir)/drill $(drillmandir)/man1/drill.1
	45	+ test ! -d $(drillmandir) \|\| rmdir -p $(drillmandir)/man1 \|\| :;
	46	+ test ! -d $(drillbindir) \|\| rmdir -p $(drillbindir) \|\| : ;
	47
	48	clean-drill:
	49	$(LIBTOOL) --mode clean rm -f $(DRILL_LOBJS) drill/drill drill/drill.1
	50	@@ -202,23 +206,23 @@ examples/ldns-verify-zone.1: $(srcdir)/examples/ldns-verify-zone.1.in
	51	$(edit) $(srcdir)/examples/ldns-verify-zone.1.in > examples/ldns-verify-zone.1
	52
	53	install-examples: $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) examples/ldns-dane.1 examples/ldns-verify-zone.1
	54	- $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
	55	- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
	56	- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
	57	+ $(INSTALL) -m 755 -d $(examplesbindir)
	58	+ $(INSTALL) -m 755 -d $(examplesmandir)
	59	+ $(INSTALL) -m 755 -d $(examplesmandir)/man1
	60	for p in $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) ; do \
	61	- $(LIBTOOL) --mode=install cp $$p $(DESTDIR)$(bindir) ; \
	62	+ $(LIBTOOL) --mode=install cp $$p $(examplesbindir) ; \
	63	if test -f $$p.1 ; \
	64	- then $(INSTALL) -m 644 $$p.1 $(DESTDIR)$(mandir)/man1 ; \
65	- else $(INSTALL) -m 644 $(srcdir)/$$p.1 $(DESTDIR)$(mandir)/man1 ; \
66	+ then $(INSTALL) -m 644 $$p.1 $(examplesmandir)/man1 ; \
67	+ else $(INSTALL) -m 644 $(srcdir)/$$p.1 $(examplesmandir)/man1 ; \
68	fi ; \
69	done
70
71	uninstall-examples:
72	for p in $(EX_PROGS_BASENM) ; do \
73	- rm -f $(DESTDIR)$(bindir)/$$p $(DESTDIR)$(mandir)/man1/$$p.1 ;\
74	+ rm -f $(examplesbindir)/$$p $(examplesmandir)/man1/$$p.1 ;\
75	done
76	- test ! -d $(DESTDIR)$(mandir) \|\| rmdir -p $(DESTDIR)$(mandir)/man1 \|\| :;
77	- test ! -d $(DESTDIR)$(bindir) \|\| rmdir -p $(DESTDIR)$(bindir) \|\| : ;
78	+ test ! -d $(examplesmandir) \|\| rmdir -p $(examplesmandir)/man1 \|\| :;
79	+ test ! -d $(examplesbindir) \|\| rmdir -p $(examplesbindir) \|\| : ;
80
81	clean-examples:
82	$(LIBTOOL) --mode clean rm -f $(EXAMPLE_PROGS)
83	--
84	2.27.0
85