From 4d0a65c33ed691f0b2d9b7cccdd5d1e6a50c1df1 Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Tue, 30 Dec 2008 11:53:13 -0500
Subject: Check for existence of $(builddir)/ssl before installing it.

---
 ChangeLog   |  8 +++++++-
 Makefile.am | 18 ++++++++++--------
 Makefile.in | 18 ++++++++++--------
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 846c1a8f..716fe9b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-30  Dave Brolley  <brolley@redhat.com>
+
+	* Makefile.am (install-data-local): Test for existence of $(builddir)/ssl
+	before installing it.
+	* Makefile.in: Regenerated.
+
 2008-12-29  Frank Ch. Eigler  <fche@elastic.org>
 
 	* Makefile.am (install-data, uninstall-data): Use
@@ -5,7 +11,7 @@
 
 2008-12-26  Dave Brolley  <brolley@redhat.com>
 
-	* Makefile.am (stamp-ssl): Disable automake building of this target.
+	* Makefile.am (stamp-ssl): Disable automatic building of this target.
 	* Makefile.in: Regenerated.
 
 2008-12-24  Dave Brolley  <brolley@redhat.com>
diff --git a/Makefile.am b/Makefile.am
index ded994b6..a1769e06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -198,14 +198,16 @@ install-data-local:
 			i_cmd="$(INSTALL_PROGRAM)"; else \
 			i_cmd="$(INSTALL_DATA)"; fi; \
 			$$i_cmd -D $$f $(DESTDIR)$(docdir)/examples/$$f; done)
-	(cd $(builddir)/ssl/server; for f in pw; \
-		do $(INSTALL) -m 600 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/server/$$f; done)
-	(cd $(builddir)/ssl/server; for f in *.db; \
-		do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/server/$$f; done)
-	(cd $(builddir)/ssl/server; for f in *.cert; \
-		do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/server/$$f; done)
-	(cd $(builddir)/ssl/client; for f in *.db; \
-		do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/client/$$f; done)
+	if test -d "$(builddir)/ssl"; then \
+		(cd $(builddir)/ssl/server; for f in pw; \
+			do $(INSTALL) -m 600 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/server/$$f; done); \
+		(cd $(builddir)/ssl/server; for f in *.db; \
+			do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/server/$$f; done); \
+		(cd $(builddir)/ssl/server; for f in *.cert; \
+			do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/server/$$f; done); \
+		(cd $(builddir)/ssl/client; for f in *.db; \
+			do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/client/$$f; done); \
+	fi
 
 TEST_COV_DIR = coverage
 
diff --git a/Makefile.in b/Makefile.in
index 0bd94f48..badd2263 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1533,14 +1533,16 @@ install-data-local:
 			i_cmd="$(INSTALL_PROGRAM)"; else \
 			i_cmd="$(INSTALL_DATA)"; fi; \
 			$$i_cmd -D $$f $(DESTDIR)$(docdir)/examples/$$f; done)
-	(cd $(builddir)/ssl/server; for f in pw; \
-		do $(INSTALL) -m 600 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/server/$$f; done)
-	(cd $(builddir)/ssl/server; for f in *.db; \
-		do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/server/$$f; done)
-	(cd $(builddir)/ssl/server; for f in *.cert; \
-		do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/server/$$f; done)
-	(cd $(builddir)/ssl/client; for f in *.db; \
-		do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/client/$$f; done)
+	if test -d "$(builddir)/ssl"; then \
+		(cd $(builddir)/ssl/server; for f in pw; \
+			do $(INSTALL) -m 600 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/server/$$f; done); \
+		(cd $(builddir)/ssl/server; for f in *.db; \
+			do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/server/$$f; done); \
+		(cd $(builddir)/ssl/server; for f in *.cert; \
+			do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/server/$$f; done); \
+		(cd $(builddir)/ssl/client; for f in *.db; \
+			do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/client/$$f; done); \
+	fi
 
 gcov:
 	@-$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check
-- 
cgit