diff options
| -rw-r--r-- | cmake/PostInstall.in | 9 | ||||
| -rw-r--r-- | cmake/PostUninstall.in | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/devbind/devbind.py | 0 | ||||
| -rwxr-xr-x | tools/mrmarch/mrmarch.in | 10 |
4 files changed, 8 insertions, 13 deletions
diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in index 7867b2f..3315661 100644 --- a/cmake/PostInstall.in +++ b/cmake/PostInstall.in @@ -1,20 +1,15 @@ -altdir_path="@CMAKE_INSTALL_PREFIX@/alternatives_altdir" -admindir_path="@CMAKE_INSTALL_PREFIX@/alternatives_admindir" +altdir_path="@CMAKE_INSTALL_PREFIX@/altdir" mrzcpd_bin_path="@CMAKE_INSTALL_PREFIX@/bin" if [ ! -d "$altdir_path" ]; then mkdir -p "$altdir_path" fi -if [ ! -d "$admindir_path" ]; then - mkdir -p "$admindir_path" -fi - if [ ! -d "$mrzcpd_bin_path" ]; then mkdir -p "$mrzcpd_bin_path" fi -command="update-alternatives --admindir @CMAKE_INSTALL_PREFIX@/alternatives_admindir --altdir @CMAKE_INSTALL_PREFIX@/alternatives_altdir \ +command="update-alternatives --altdir @CMAKE_INSTALL_PREFIX@/altdir \ --install \ @CMAKE_INSTALL_PREFIX@/bin/mrzcpd \ mrzcpd \ diff --git a/cmake/PostUninstall.in b/cmake/PostUninstall.in index 62a47b9..9e8184f 100644 --- a/cmake/PostUninstall.in +++ b/cmake/PostUninstall.in @@ -1,5 +1,5 @@ %systemd_postun_with_restart mrenv.service mrzcpd.service mrtunnat.service /sbin/ldconfig -command="update-alternatives --remove mrzcpd @MR_INSTALL_BINDIR@/mrzcpd --admindir @CMAKE_INSTALL_PREFIX@/alternatives_admindir --altdir @CMAKE_INSTALL_PREFIX@/alternatives_altdir" +command="update-alternatives --remove mrzcpd @MR_INSTALL_BINDIR@/mrzcpd --altdir @CMAKE_INSTALL_PREFIX@/altdir" eval $command diff --git a/tools/devbind/devbind.py b/tools/devbind/devbind.py index c0ec822..c0ec822 100644..100755 --- a/tools/devbind/devbind.py +++ b/tools/devbind/devbind.py diff --git a/tools/mrmarch/mrmarch.in b/tools/mrmarch/mrmarch.in index 915c72b..99f3a9a 100755 --- a/tools/mrmarch/mrmarch.in +++ b/tools/mrmarch/mrmarch.in @@ -59,13 +59,13 @@ fi # Perform actions based on parameters if [ "$display_flag" = true ]; then - update-alternatives --display mrzcpd --admindir @CMAKE_INSTALL_PREFIX@/alternatives_admindir --altdir @CMAKE_INSTALL_PREFIX@/alternatives_altdir + update-alternatives --display mrzcpd --altdir @CMAKE_INSTALL_PREFIX@/altdir exit fi if [ "$config_flag" = true ]; then - update-alternatives --config mrzcpd --admindir @CMAKE_INSTALL_PREFIX@/alternatives_admindir --altdir @CMAKE_INSTALL_PREFIX@/alternatives_altdir/ + update-alternatives --config mrzcpd --altdir @CMAKE_INSTALL_PREFIX@/altdir/ exit fi @@ -74,12 +74,12 @@ if [ "$auto_flag" = true ]; then fi if [ "$march" == "icelake-server" ]; then - update-alternatives --set mrzcpd /opt/tsg/mrzcpd/icelake-server/bin/mrzcpd --admindir @CMAKE_INSTALL_PREFIX@/alternatives_admindir --altdir @CMAKE_INSTALL_PREFIX@/alternatives_altdir + update-alternatives --set mrzcpd /opt/tsg/mrzcpd/icelake-server/bin/mrzcpd --altdir @CMAKE_INSTALL_PREFIX@/altdir exit elif [ "$march" == "znver1" ]; then - update-alternatives --set mrzcpd /opt/tsg/mrzcpd/znver1/bin/mrzcpd --admindir @CMAKE_INSTALL_PREFIX@/alternatives_admindir --altdir @CMAKE_INSTALL_PREFIX@/alternatives_altdir + update-alternatives --set mrzcpd /opt/tsg/mrzcpd/znver1/bin/mrzcpd --altdir @CMAKE_INSTALL_PREFIX@/altdir exit else - update-alternatives --set mrzcpd /opt/tsg/mrzcpd/corei7/bin/mrzcpd --admindir @CMAKE_INSTALL_PREFIX@/alternatives_admindir --altdir @CMAKE_INSTALL_PREFIX@/alternatives_altdir + update-alternatives --set mrzcpd /opt/tsg/mrzcpd/corei7/bin/mrzcpd --altdir @CMAKE_INSTALL_PREFIX@/altdir exit fi |