From 17d44a769c1e81f787b86f550bdb5bf43c59a150 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Fri, 18 Dec 2015 11:13:22 +0100
Subject: [PATCH] Test & fix installing

---
 Makefile.in                                      |  4 ++--
 src/test/tpkg/105-install.tpkg/105-install.dsc   | 16 ++++++++++++++++
 src/test/tpkg/105-install.tpkg/105-install.test  |  8 ++++++++
 .../115-install-linked.dsc                       | 16 ++++++++++++++++
 .../115-install-linked.test                      |  8 ++++++++
 5 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 src/test/tpkg/105-install.tpkg/105-install.dsc
 create mode 100644 src/test/tpkg/105-install.tpkg/105-install.test
 create mode 100644 src/test/tpkg/115-install-linked.tpkg/115-install-linked.dsc
 create mode 100644 src/test/tpkg/115-install-linked.tpkg/115-install-linked.test

diff --git a/Makefile.in b/Makefile.in
index 2401c646..5f10efca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,7 +58,7 @@ install: all getdns.pc @INSTALL_GETDNS_QUERY@
 	$(INSTALL) -m 644 $(srcdir)/LICENSE $(DESTDIR)$(docdir)
 	$(INSTALL) -m 644 $(srcdir)/NEWS $(DESTDIR)$(docdir)
 	$(INSTALL) -m 644 $(srcdir)/README.md $(DESTDIR)$(docdir)
-	$(INSTALL) -m 644 -d $(DESTDIR)$(libdir)/pkgconfig
+	$(INSTALL) -m 755 -d $(DESTDIR)$(libdir)/pkgconfig
 	$(INSTALL) -m 644 getdns.pc $(DESTDIR)$(libdir)/pkgconfig
 	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)/spec
 	$(INSTALL) -m 644 $(srcdir)/spec/index.html $(DESTDIR)$(docdir)/spec
@@ -235,7 +235,7 @@ distcheck: $(distdir).tar.gz
 	rm -rf $(distdir)
 	@echo "*** Package $(distdir).tar.gz is ready for distribution"
 
-getdns.pc: getdns.pc.in
+getdns.pc: $(srcdir)/getdns.pc.in
 	./config.status $@
 
 Makefile: $(srcdir)/Makefile.in config.status
diff --git a/src/test/tpkg/105-install.tpkg/105-install.dsc b/src/test/tpkg/105-install.tpkg/105-install.dsc
new file mode 100644
index 00000000..31d0c666
--- /dev/null
+++ b/src/test/tpkg/105-install.tpkg/105-install.dsc
@@ -0,0 +1,16 @@
+BaseName: 105-install
+Version: 1.0
+Description: Install the library
+CreationDate: vr dec 18 10:52:02 CET 2015
+Maintainer: Willem Toorop
+Category: 
+Component:
+CmdDepends: 
+Depends: 100-compile.tpkg
+Help:
+Pre: 
+Post: 
+Test: 105-install.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/src/test/tpkg/105-install.tpkg/105-install.test b/src/test/tpkg/105-install.tpkg/105-install.test
new file mode 100644
index 00000000..7e94ce6e
--- /dev/null
+++ b/src/test/tpkg/105-install.tpkg/105-install.test
@@ -0,0 +1,8 @@
+# #-- 105-install.test --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+cd "${BUILDDIR}/build"
+make install
diff --git a/src/test/tpkg/115-install-linked.tpkg/115-install-linked.dsc b/src/test/tpkg/115-install-linked.tpkg/115-install-linked.dsc
new file mode 100644
index 00000000..d143547a
--- /dev/null
+++ b/src/test/tpkg/115-install-linked.tpkg/115-install-linked.dsc
@@ -0,0 +1,16 @@
+BaseName: 115-install-linked
+Version: 1.0
+Description: Link getdns_query program
+CreationDate: vr dec 18 10:52:26 CET 2015
+Maintainer: Willem Toorop
+Category: 
+Component:
+CmdDepends: 
+Depends: 110-link.tpkg
+Help:
+Pre: 
+Post: 
+Test: 115-install-linked.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/src/test/tpkg/115-install-linked.tpkg/115-install-linked.test b/src/test/tpkg/115-install-linked.tpkg/115-install-linked.test
new file mode 100644
index 00000000..7480aa03
--- /dev/null
+++ b/src/test/tpkg/115-install-linked.tpkg/115-install-linked.test
@@ -0,0 +1,8 @@
+# #-- 115-install-linked.test --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+cd "${BUILDDIR}/build"
+make install-getdns_query