Use bindir in install hooks rather than CDE_INSTALLATION_TOP

Patch supplied by Peter G.

diff --git a/cde/programs/dtmail/dtmail/Makefile.am b/cde/programs/dtmail/dtmail/Makefile.am
index e9f9c65ab36e397caf65691665576644430b67bf..78975dea897e8b75b16462987c9f793c24f9a5be 100644 (file)
--- 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 07407343cb212449cb2d6fc5f38f92631ada9471..d5321335af57fe95d8d42d7879b32c86d34abfbe 100644 (file)
--- 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 4e6726f8163efa916498b7e39b1b1018b3fedbdb..4336ad173ababf5d86cc1dec1bf137239d92b337 100644 (file)
--- 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 2e608877d74c4604a39351ba89cb8456eb1849ff..d497adb34a20784265df1abd296cc32c4bf2a143 100644 (file)
--- 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