DESTDIR is honoured by make install.

git-svn-id: file:///svn/unbound/trunk@1074 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/Makefile.in b/Makefile.in
index 5050a19bcb1098a845c1e669b9d1be09b8ecb64b..8d352b689b85223f20fe7788dfad1a47de27f727 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -257,35 +257,35 @@ strip:
        strip unbound-host
 
 install:
-       $(INSTALL) -m 755 -d $(sbindir)
-       $(INSTALL) -m 755 -d $(mandir)
-       $(INSTALL) -m 755 -d $(mandir)/man8
-       $(INSTALL) -m 755 -d $(mandir)/man5
-       $(INSTALL) -m 755 -d $(mandir)/man3
-       $(INSTALL) -m 755 -d $(mandir)/man1
-       $(INSTALL) -m 755 -d $(libdir)
-       $(INSTALL) -m 755 -d $(includedir)
-       $(LIBTOOL) --mode=install cp unbound $(sbindir)/unbound
-       $(LIBTOOL) --mode=install cp unbound-checkconf $(sbindir)/unbound-checkconf
-       $(LIBTOOL) --mode=install cp unbound-host $(sbindir)/unbound-host
-       $(INSTALL) -c -m 644 $(srcdir)/doc/unbound.8 $(mandir)/man8
-       $(INSTALL) -c -m 644 $(srcdir)/doc/unbound-checkconf.8 $(mandir)/man8
-       $(INSTALL) -c -m 644 $(srcdir)/doc/unbound.conf.5 $(mandir)/man5
-       $(INSTALL) -c -m 644 $(srcdir)/doc/unbound-host.1 $(mandir)/man1
-       $(INSTALL) -c -m 644 $(srcdir)/doc/libunbound.3 $(mandir)/man3
-       if test ! -e $(configfile); then $(INSTALL) -d `dirname $(configfile)`; $(INSTALL) -c -m 644 $(srcdir)/doc/example.conf $(configfile); fi
-       $(LIBTOOL) --mode=install cp $(srcdir)/libunbound/unbound.h $(includedir)/unbound.h
-       $(LIBTOOL) --mode=install cp libunbound.la $(libdir)
-       $(LIBTOOL) --mode=finish $(libdir)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(sbindir)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8
+       $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man5
+       $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man3
+       $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+       $(INSTALL) -m 755 -d $(DESTDIR)$(libdir)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(includedir)
+       $(LIBTOOL) --mode=install cp unbound $(DESTDIR)$(sbindir)/unbound
+       $(LIBTOOL) --mode=install cp unbound-checkconf $(DESTDIR)$(sbindir)/unbound-checkconf
+       $(LIBTOOL) --mode=install cp unbound-host $(DESTDIR)$(sbindir)/unbound-host
+       $(INSTALL) -c -m 644 $(srcdir)/doc/unbound.8 $(DESTDIR)$(mandir)/man8
+       $(INSTALL) -c -m 644 $(srcdir)/doc/unbound-checkconf.8 $(DESTDIR)$(mandir)/man8
+       $(INSTALL) -c -m 644 $(srcdir)/doc/unbound.conf.5 $(DESTDIR)$(mandir)/man5
+       $(INSTALL) -c -m 644 $(srcdir)/doc/unbound-host.1 $(DESTDIR)$(mandir)/man1
+       $(INSTALL) -c -m 644 $(srcdir)/doc/libunbound.3 $(DESTDIR)$(mandir)/man3
+       if test ! -e $(DESTDIR)$(configfile); then $(INSTALL) -d `dirname $(DESTDIR)$(configfile)`; $(INSTALL) -c -m 644 $(srcdir)/doc/example.conf $(DESTDIR)$(configfile); fi
+       $(LIBTOOL) --mode=install cp $(srcdir)/libunbound/unbound.h $(DESTDIR)$(includedir)/unbound.h
+       $(LIBTOOL) --mode=install cp libunbound.la $(DESTDIR)$(libdir)
+       $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
 
 uninstall:
-       rm -f -- $(sbindir)/unbound $(sbindir)/unbound-checkconf $(sbindir)/unbound-host
-       rm -f -- $(mandir)/man8/unbound.8 $(mandir)/man8/unbound-checkconf.8 $(mandir)/man5/unbound.conf.5
-       rm -f -- $(mandir)/man1/unbound-host.1 $(mandir)/man3/libunbound.3
-       rm -f -- $(includedir)/unbound.h
-       $(LIBTOOL) --mode=uninstall rm -f $(libdir)/libunbound.la
+       rm -f -- $(DESTDIR)$(sbindir)/unbound $(DESTDIR)$(sbindir)/unbound-checkconf $(DESTDIR)$(sbindir)/unbound-host
+       rm -f -- $(DESTDIR)$(mandir)/man8/unbound.8 $(DESTDIR)$(mandir)/man8/unbound-checkconf.8 $(DESTDIR)$(mandir)/man5/unbound.conf.5
+       rm -f -- $(DESTDIR)$(mandir)/man1/unbound-host.1 $(DESTDIR)$(mandir)/man3/libunbound.3
+       rm -f -- $(DESTDIR)$(includedir)/unbound.h
+       $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libunbound.la
        @echo
-       @echo "You still need to remove `dirname $(configfile)` , $(configfile) by hand"
+       @echo "You still need to remove `dirname $(DESTDIR)$(configfile)` , $(DESTDIR)$(configfile) by hand"
 
 download_ldns:
        svn export https://www.nlnetlabs.nl/ldns/svn/trunk/makedist.sh ldns_makedist.sh

diff --git a/doc/Changelog b/doc/Changelog
index 9986687903be957b08233165b8bbdde62e703d98..b4afd601f3c35c517cc6d18dcc03577e22adfa32 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+25 April 2008: Wouter
+       - DESTDIR is honored by the Makefile for rpms.
+
 24 April 2008: Wouter
        - chroot checks improved. working directory relative to chroot.
          checks if config file path is inside chroot. Documentation on it.