propagate libdir etc to subdir configures

diff --git a/Makefile.in b/Makefile.in
index 6e26be702c5d1fe395b9c2534fdf9ce3a4602462..4a1a742212b57e727d56c4b5eda46a6b96723581 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,7 @@ exec_prefix     = @exec_prefix@
 bindir                 = @bindir@
 mandir                 = @mandir@
 libdir         = @libdir@
+includedir     = @includedir@
 doxygen                = @doxygen@
 glibtool       = @glibtool@
 libtool                = @libtool@
@@ -80,7 +81,7 @@ all:          lib
 tools:         $(PROG_TARGETS)
 
 ./drill/Makefile:
-               ( $(INSTALL) -d drill ; cd drill ; ../$(srcdir)/drill/configure --prefix=$(prefix) LDFLAGS="-L../.libs" CPPFLAGS="-I.. -I../..")
+               ( $(INSTALL) -d drill ; cd drill ; ../$(srcdir)/drill/configure --prefix=$(prefix) --bindir=$(bindir) --mandir=$(mandir) LDFLAGS="-L../.libs" CPPFLAGS="-I.. -I../..")
 
 drill-config:  ./drill/Makefile
 
@@ -100,7 +101,7 @@ drill-install:
                ( cd drill ; $(MAKE) -f Makefile install)
 
 ./examples/Makefile:
-               ( $(INSTALL) -d examples ; cd examples ; ../$(srcdir)/examples/configure --prefix=$(prefix) LDFLAGS="-L../.libs" CPPFLAGS="-I. -I.. -I../..")
+               ( $(INSTALL) -d examples ; cd examples ; ../$(srcdir)/examples/configure --prefix=$(prefix) --bindir=$(bindir) --mandir=$(mandir) LDFLAGS="-L../.libs" CPPFLAGS="-I. -I.. -I../..")
 
 examples-config:       ./examples/Makefile
 
@@ -138,7 +139,7 @@ tests-confclean:    ./drill/Makefile
 
 lib:           $(LIBDNS_OBJECTS) b64_pton$U.o b64_ntop$U.o
                $(LINK_LIB) -o libldns.la $(LIBDNS_LOBJECTS) b64_pton$U.lo b64_ntop$U.lo \
-               -rpath $(prefix)/lib
+               -rpath $(libdir)/lib
 
 doc:           $(srcdir)/doc/function_manpages 
                $(INSTALL) -d doc
@@ -148,23 +149,12 @@ endif
                cat $(srcdir)/ldns/*.h | $(srcdir)/doc/doxyparse.pl -m $(srcdir)/doc/function_manpages 2>&1 | \
                grep -v ^doxygen | grep -v ^cat  > doc/ldns_manpages
 
-install:       install-h install-lib install-progs install-doc
+install:       install-h install-lib install-doc
 
-uninstall:     uninstall-doc uninstall-h uninstall-lib uninstall-progs
+uninstall:     uninstall-doc uninstall-h uninstall-lib
 
 destclean:     uninstall
 
-install-progs:  all tools
-               for i in $(PROG_TARGETS); do \
-                       ${INSTALL} -c $$i $(bindir)/ ; done
-               exit 0
-
-uninstall-progs:
-               for i in $(PROG_TARGETS); do \
-                       rm -f $(bindir)/$$i ; done
-               exit 0
-               rmdir -p --ignore-fail-on-non-empty $(bindir)
-
 install-doc:   doc
                ${INSTALL} -d $(mandir)/man3
                cp -Rp doc/man/man3/* $(mandir)/man3/
@@ -182,14 +172,14 @@ uninstall-doc:    doc
                rmdir -p --ignore-fail-on-non-empty $(mandir)/man3
 
 install-h:     lib
-               $(INSTALL) -m 755 -d $(prefix)/include/ldns
+               $(INSTALL) -m 755 -d $(includedir)/ldns
                for i in $(LIBDNS_HEADERS); do \
-                       MVPROG=/bin/cp $(INSTALL) -m 644 $$i $(prefix)/include/ldns/; done
+                       MVPROG=/bin/cp $(INSTALL) -m 644 $$i $(includedir)/ldns/; done
 
 uninstall-h:
                for i in $(LIBDNS_HEADERS); do \
-                       rm -f $(prefix)/include/$$i; done
-               [ ! -d $(prefix)/include/ldns ] || rmdir -p --ignore-fail-on-non-empty $(prefix)/include/ldns
+                       rm -f $(includedir)/$$i; done
+               [ ! -d $(includedir)/ldns ] || rmdir -p --ignore-fail-on-non-empty $(includedir)/ldns
                exit 0
        
 install-lib:   lib

diff --git a/drill/Makefile.in b/drill/Makefile.in
index ab36df560a913a552f525439ce49be893847dcbd..a8a09e1015c89799d97ca2cc2c8bbd46a533d037 100644 (file)
--- a/drill/Makefile.in
+++ b/drill/Makefile.in
@@ -102,9 +102,8 @@ uninstall:
        @echo
        rm -f -- $(DESTDIR)$(bindir)/drill
        rm -f -- $(DESTDIR)$(mandir)/man1/drill.1
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)$(bindir)
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)$(mandir)/man1
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)$(mandir)
+       rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(bindir)
+       rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(mandir)/man1
        @echo
 
 lint:

diff --git a/examples/Makefile.in b/examples/Makefile.in
index d460867df22c92ac14842f4cea4f857f4ff07b80..70f3080703998648daca905bd392ebd76853c957 100644 (file)
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -21,7 +21,7 @@ COMPILE         = $(CC) $(CPPFLAGS) $(CFLAGS)
 LINK            = $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS)
 
 HEADER         = config.h
-TESTS          = ldns-read-zone \
+PROGRAMS       = ldns-read-zone \
                  ldns-mx \
                  ldns-chaos \
                  ldns-update \
@@ -32,7 +32,7 @@ TESTS         = ldns-read-zone \
 
 .PHONY:        all clean realclean
 
-all:   $(TESTS)
+all:   $(PROGRAMS)
 
 ldns-read-zone:        ldns-read-zone.o
                        $(LINK) -o $@ $+
@@ -64,7 +64,7 @@ ldns-key2ds:  ldns-key2ds.o
 
 clean:
        rm -f *.o
-       rm -f $(TESTS)
+       rm -f $(PROGRAMS)
 
 realclean: clean
        rm -rf autom4te.cache/
@@ -74,18 +74,18 @@ realclean: clean
 confclean: clean
        rm -rf config.log config.status config.h Makefile
 
-install:       $(TESTS)
-               $(INSTALL) -d -m 755 ${prefix}/bin
-               for i in $(TESTS); do \
-                       ${INSTALL} -c $$i ${prefix}/bin/ ; done
+install:       $(PROGRAMS)
+               $(INSTALL) -d -m 755 $(bindir)
+               for i in $(PROGRAMS); do \
+                       ${INSTALL} -c $$i $(bindir) ; done
                exit 0
 
 
 uninstall:
-               for i in $(TESTS); do \
+               for i in $(PROGRAMS); do \
                        rm -f $(bindir)/$$i ; done
                exit 0
-               rmdir --ignore-fail-on-non-empty -p $(prefix)/bin
+               rmdir --ignore-fail-on-non-empty -p $(bindir)