From 8cd5d9f0e219a0482a28c8bb96d81d9b4017f52c Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Mon, 29 Dec 2008 17:00:34 -0500
Subject: build fix for ssl code: install into $prefix rather than /etc

---
 ChangeLog   |  5 +++++
 Makefile.am | 10 +++++-----
 Makefile.in | 10 +++++-----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 866816af..846c1a8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-29  Frank Ch. Eigler  <fche@elastic.org>
+
+	* Makefile.am (install-data, uninstall-data): Use
+	$(DESTDIR)$(sysconfdir) instead of hard-coded /etc paths.
+
 2008-12-26  Dave Brolley  <brolley@redhat.com>
 
 	* Makefile.am (stamp-ssl): Disable automake building of this target.
diff --git a/Makefile.am b/Makefile.am
index d7a216dd..ded994b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,13 +199,13 @@ install-data-local:
 			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 /etc/systemtap/ssl/server/$$f; done)
+		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 /etc/systemtap/ssl/server/$$f; done)
+		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 /etc/systemtap/ssl/server/$$f; done)
+		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 /etc/systemtap/ssl/client/$$f; done)
+		do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/client/$$f; done)
 
 TEST_COV_DIR = coverage
 
@@ -245,7 +245,7 @@ uninstall-local:
 	  echo " rm -f '$(SAMPLE_INSTALL_DIR)/$$p'"; \
 	  rm -f "$(SAMPLE_INSTALL_DIR)/$$p"; \
 	done
-	rm -rf /etc/systemtap
+	rm -rf $(DESTDIR)$(sysconfdir)/systemtap
 # XXX: leaves behind man pages
 
 SUBDIRS = testsuite doc
diff --git a/Makefile.in b/Makefile.in
index 5b1690b8..0bd94f48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1534,13 +1534,13 @@ install-data-local:
 			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 /etc/systemtap/ssl/server/$$f; done)
+		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 /etc/systemtap/ssl/server/$$f; done)
+		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 /etc/systemtap/ssl/server/$$f; done)
+		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 /etc/systemtap/ssl/client/$$f; done)
+		do $(INSTALL) -m 664 -D $$f $(DESTDIR)$(sysconfdir)/systemtap/ssl/client/$$f; done)
 
 gcov:
 	@-$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check
@@ -1578,7 +1578,7 @@ uninstall-local:
 	  echo " rm -f '$(SAMPLE_INSTALL_DIR)/$$p'"; \
 	  rm -f "$(SAMPLE_INSTALL_DIR)/$$p"; \
 	done
-	rm -rf /etc/systemtap
+	rm -rf $(DESTDIR)$(sysconfdir)/systemtap
 
 check:
 	SRCDIR=`cd $(srcdir); pwd`; \
-- 
cgit