| 1 | From: Tobias Geerinckx-Rice <[email protected]>
|
| 2 | Date: Sun, 15 Sep 2024 00:00:00 +0000
|
| 3 | Subject: [PATCH]: Split installation of drill and examples.
|
| 4 |
|
| 5 | ---
|
| 6 | Allow installing drill and examples into separate directory hierarchies.
|
| 7 | Based on the original by Raghav Gururajan <[email protected]>
|
| 8 |
|
| 9 | Makefile.in | 38 +++++++++++++++++++++-----------------
|
| 10 | 1 file changed, 21 insertions(+), 17 deletions(-)
|
| 11 |
|
| 12 | diff -Naur a/Makefile.in b/Makefile.in
|
| 13 | |
| 14 | |
| 15 | @@ -14,6 +14,10 @@
|
| 16 | includedir = @includedir@
|
| 17 | sysconfdir = @sysconfdir@
|
| 18 | doxygen = @doxygen@
|
| 19 | +drillbindir = @drillbindir@
|
| 20 | +drillmandir = @drillmandir@
|
| 21 | +examplesbindir = @examplesbindir@
|
| 22 | +examplesmandir = @examplesmandir@
|
| 23 | pywrapdir = $(srcdir)/contrib/python
|
| 24 | pyldnsxwrapdir = $(srcdir)/contrib/ldnsx
|
| 25 | p5_dns_ldns_dir = $(srcdir)/contrib/DNS-LDNS
|
| 26 | @@ -177,16 +181,16 @@
|
| 27 | $(edit) $(srcdir)/drill/drill.1.in > drill/drill.1
|
| 28 |
|
| 29 | install-drill: drill/drill drill/drill.1
|
| 30 | - $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
|
| 31 | - $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
|
| 32 | - $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
|
| 33 | - $(LIBTOOL) --mode=install cp drill/drill$(EXEEXT) $(DESTDIR)$(bindir)
|
| 34 | - $(INSTALL) -m 644 drill/drill.1 $(DESTDIR)$(mandir)/man1/drill.1
|
| 35 | + $(INSTALL) -m 755 -d $(DESTDIR)$(drillbindir)
|
| 36 | + $(INSTALL) -m 755 -d $(DESTDIR)$(drillmandir)
|
| 37 | + $(INSTALL) -m 755 -d $(DESTDIR)$(drillmandir)/man1
|
| 38 | + $(LIBTOOL) --mode=install cp drill/drill$(EXEEXT) $(DESTDIR)$(drillbindir)
|
| 39 | + $(INSTALL) -m 644 drill/drill.1 $(DESTDIR)$(drillmandir)/man1/drill.1
|
| 40 |
|
| 41 | uninstall-drill:
|
| 42 | - rm -f $(DESTDIR)$(bindir)/drill$(EXEEXT) $(DESTDIR)$(mandir)/man1/drill.1
|
| 43 | - test ! -d $(DESTDIR)$(mandir) || rmdir -p $(DESTDIR)$(mandir)/man1 || :;
|
| 44 | - test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
|
| 45 | + rm -f $(DESTDIR)$(drillbindir)/drill$(EXEEXT) $(DESTDIR)$(drillmandir)/man1/drill.1
|
| 46 | + test ! -d $(DESTDIR)$(drillmandir) || rmdir -p $(DESTDIR)$(drillmandir)/man1 || :;
|
| 47 | + test ! -d $(DESTDIR)$(drillbindir) || rmdir -p $(DESTDIR)$(drillbindir) || : ;
|
| 48 |
|
| 49 | clean-drill:
|
| 50 | $(LIBTOOL) --mode clean rm -f $(DRILL_LOBJS) drill/drill$(EXEEXT) drill/drill.1
|
| 51 | @@ -228,23 +232,23 @@
|
| 52 | $(edit) $(srcdir)/examples/ldns-verify-zone.1.in > examples/ldns-verify-zone.1
|
| 53 |
|
| 54 | install-examples: $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) examples/ldns-dane.1 examples/ldns-verify-zone.1
|
| 55 | - $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
|
| 56 | - $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
|
| 57 | - $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
|
| 58 | + $(INSTALL) -m 755 -d $(DESTDIR)$(examplesbindir)
|
| 59 | + $(INSTALL) -m 755 -d $(DESTDIR)$(examplesmandir)
|
| 60 | + $(INSTALL) -m 755 -d $(DESTDIR)$(examplesmandir)/man1
|
| 61 | for p in $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) ; do \
|
| 62 | - $(LIBTOOL) --mode=install cp $$p$(EXEEXT) $(DESTDIR)$(bindir) ; \
|
| 63 | + $(LIBTOOL) --mode=install cp $$p$(EXEEXT) $(DESTDIR)$(examplesbindir) ; \
|
| 64 | if test -f $$p.1 ; \
|
| 65 | - then $(INSTALL) -m 644 $$p.1 $(DESTDIR)$(mandir)/man1 ; \
|
| 66 | - else $(INSTALL) -m 644 $(srcdir)/$$p.1 $(DESTDIR)$(mandir)/man1 ; \
|
| 67 | + then $(INSTALL) -m 644 $$p.1 $(DESTDIR)$(examplesmandir)/man1 ; \
|
| 68 | + else $(INSTALL) -m 644 $(srcdir)/$$p.1 $(DESTDIR)$(examplesmandir)/man1 ; \
|
| 69 | fi ; \
|
| 70 | done
|
| 71 |
|
| 72 | uninstall-examples:
|
| 73 | for p in $(EX_PROGS_BASENM) ; do \
|
| 74 | - rm -f $(DESTDIR)$(bindir)/$$p$(EXEEXT) $(DESTDIR)$(mandir)/man1/$$p.1 ;\
|
| 75 | + rm -f $(DESTDIR)$(examplesbindir)/$$p$(EXEEXT) $(DESTDIR)$(examplesmandir)/man1/$$p.1 ;\
|
| 76 | done
|
| 77 | - test ! -d $(DESTDIR)$(mandir) || rmdir -p $(DESTDIR)$(mandir)/man1 || :;
|
| 78 | - test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
|
| 79 | + test ! -d $(DESTDIR)$(examplesmandir) || rmdir -p $(DESTDIR)$(examplesmandir)/man1 || :;
|
| 80 | + test ! -d $(DESTDIR)$(examplesbindir) || rmdir -p $(DESTDIR)$(examplesbindir) || : ;
|
| 81 |
|
| 82 | clean-examples:
|
| 83 | for p in $(EX_PROGS_BASENM) ; do \
|