From a6e78364d074d9875895a77091c9f869f9299d04 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Mon, 23 Mar 2020 13:00:54 -0600
Subject: [PATCH] Use bindir in install hooks rather than CDE_INSTALLATION_TOP

Patch supplied by Peter G.
---
 cde/programs/dtmail/dtmail/Makefile.am       | 6 +++---
 cde/programs/dtsearchpath/dtappg/Makefile.am | 4 ++--
 cde/programs/dtsession/Makefile.am           | 4 ++--
 cde/programs/dtterm/Makefile.am              | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cde/programs/dtmail/dtmail/Makefile.am b/cde/programs/dtmail/dtmail/Makefile.am
index e9f9c65ab..78975dea8 100644
--- a/cde/programs/dtmail/dtmail/Makefile.am
+++ b/cde/programs/dtmail/dtmail/Makefile.am
@@ -72,6 +72,6 @@ dtmail_SOURCES = AliasListUiItem.C               AlternatesListUiItem.C \
 		 options_ui.C                    options_util.C
 
 install-exec-hook:
-	chown root $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin/dtmail
-	chgrp mail $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin/dtmail
-	chmod 2755 $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin/dtmail
+	chown root $(DESTDIR)$(bindir)/dtmail
+	chgrp mail $(DESTDIR)$(bindir)/dtmail
+	chmod 2755 $(DESTDIR)$(bindir)/dtmail
diff --git a/cde/programs/dtsearchpath/dtappg/Makefile.am b/cde/programs/dtsearchpath/dtappg/Makefile.am
index 07407343c..d5321335a 100644
--- a/cde/programs/dtsearchpath/dtappg/Makefile.am
+++ b/cde/programs/dtsearchpath/dtappg/Makefile.am
@@ -13,5 +13,5 @@ endif
 dtappgather_SOURCES = Options.C dtappgather.C dtappgather.h Options.h
 
 install-exec-hook:
-	chown root $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin/dtappgather
-	chmod 4755 $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin/dtappgather
+	chown root $(DESTDIR)$(bindir)/dtappgather
+	chmod 4755 $(DESTDIR)$(bindir)/dtappgather
diff --git a/cde/programs/dtsession/Makefile.am b/cde/programs/dtsession/Makefile.am
index 4e6726f81..4336ad173 100644
--- a/cde/programs/dtsession/Makefile.am
+++ b/cde/programs/dtsession/Makefile.am
@@ -119,6 +119,6 @@ sys.session.ive: sys.session.src
 
 
 install-exec-hook:
-	chown root $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin/dtsession
-	chmod 4755 $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin/dtsession
+	chown root $(DESTDIR)$(bindir)/dtsession
+	chmod 4755 $(DESTDIR)$(bindir)/dtsession
 
diff --git a/cde/programs/dtterm/Makefile.am b/cde/programs/dtterm/Makefile.am
index 2e608877d..d497adb34 100644
--- a/cde/programs/dtterm/Makefile.am
+++ b/cde/programs/dtterm/Makefile.am
@@ -44,6 +44,6 @@ dtterm.ti: terminfoChecklist
 	CPP="$(GENCPP)" $(SHELL) terminfoCreate < terminfoChecklist > $@
 
 install-exec-hook:
-	chown root $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin/dtterm
-	chmod 4755 $(DESTDIR)$(CDE_INSTALLATION_TOP)/bin/dtterm
+	chown root $(DESTDIR)$(bindir)/dtterm
+	chmod 4755 $(DESTDIR)$(bindir)/dtterm