From 019b2ab19ee18ac6b71f0162a23ddc03adae1fc2 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Thu, 30 Dec 2021 10:07:21 +0000
Subject: [PATCH 6/7] Install in libdir

---
 bin/nest-config.in           | 2 +-
 cmake/ConfigureSummary.cmake | 2 +-
 libnestutil/CMakeLists.txt   | 4 ++--
 libnestutil/config.h.in      | 2 +-
 models/CMakeLists.txt        | 4 ++--
 nest/CMakeLists.txt          | 4 ++--
 nestkernel/CMakeLists.txt    | 4 ++--
 sli/CMakeLists.txt           | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bin/nest-config.in b/bin/nest-config.in
index 6b2ee7b3f..55916b44e 100755
--- a/bin/nest-config.in
+++ b/bin/nest-config.in
@@ -66,7 +66,7 @@ while test $# -gt 0; do
         echo "@ALL_CXXFLAGS@"
         ;;
     --libs)
-        echo "-L$prefix/@CMAKE_INSTALL_LIBDIR@/nest @ALL_LIBS@"
+        echo "-L$prefix/@CMAKE_INSTALL_LIBDIR@/ @ALL_LIBS@"
         ;;
     --compiler)
         echo "@CMAKE_CXX_COMPILER@"
diff --git a/cmake/ConfigureSummary.cmake b/cmake/ConfigureSummary.cmake
index 1e14bd474..d5ca38e0b 100644
--- a/cmake/ConfigureSummary.cmake
+++ b/cmake/ConfigureSummary.cmake
@@ -197,7 +197,7 @@ function( NEST_PRINT_CONFIG_SUMMARY )
   message( "  ${CMAKE_INSTALL_FULL_BINDIR}/" )
   message( "" )
   message( "NEST dynamic libraries and user modules will be installed to:" )
-  message( "  ${CMAKE_INSTALL_FULL_LIBDIR}/nest/" )
+  message( "  ${CMAKE_INSTALL_FULL_LIBDIR}/" )
   message( "" )
   message( "Documentation and examples will be installed to:" )
   message( "  ${CMAKE_INSTALL_FULL_DOCDIR}/" )
diff --git a/libnestutil/CMakeLists.txt b/libnestutil/CMakeLists.txt
index 93ed28dc9..15aeb84da 100644
--- a/libnestutil/CMakeLists.txt
+++ b/libnestutil/CMakeLists.txt
@@ -52,8 +52,8 @@ target_include_directories( nestutil PRIVATE
     )
 
 install( TARGETS nestutil
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/nest
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/nest
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     )
 
diff --git a/libnestutil/config.h.in b/libnestutil/config.h.in
index 98aafb9ae..59c2acd72 100644
--- a/libnestutil/config.h.in
+++ b/libnestutil/config.h.in
@@ -43,7 +43,7 @@
 #define NEST_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
 #define NEST_INSTALL_DATADIR "@CMAKE_INSTALL_DATADIR@"
 #define NEST_INSTALL_DOCDIR "@CMAKE_INSTALL_DOCDIR@"
-#define NEST_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@/nest"
+#define NEST_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@"
 
 #define NEST_EXITCODE_ABORT @NEST_EXITCODE_ABORT@
 #define NEST_EXITCODE_SEGFAULT @NEST_EXITCODE_SEGFAULT@
diff --git a/models/CMakeLists.txt b/models/CMakeLists.txt
index 05d4dcd79..a8ee0f7cc 100644
--- a/models/CMakeLists.txt
+++ b/models/CMakeLists.txt
@@ -156,8 +156,8 @@ target_include_directories( models PRIVATE
     )
 
 install( TARGETS models
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/nest
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/nest
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     )
 
diff --git a/nest/CMakeLists.txt b/nest/CMakeLists.txt
index b2f46dd11..6ceb41f26 100644
--- a/nest/CMakeLists.txt
+++ b/nest/CMakeLists.txt
@@ -103,8 +103,8 @@ if ( HAVE_PYTHON )
 endif ()
 
 install( TARGETS nest nest_lib
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/nest
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/nest
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     )
 
diff --git a/nestkernel/CMakeLists.txt b/nestkernel/CMakeLists.txt
index ede7049b8..adfb70db1 100644
--- a/nestkernel/CMakeLists.txt
+++ b/nestkernel/CMakeLists.txt
@@ -152,8 +152,8 @@ target_include_directories( nestkernel PRIVATE
     )
 
 install( TARGETS nestkernel
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/nest
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/nest
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     )
 
diff --git a/sli/CMakeLists.txt b/sli/CMakeLists.txt
index f70733ce8..332002b89 100644
--- a/sli/CMakeLists.txt
+++ b/sli/CMakeLists.txt
@@ -134,8 +134,8 @@ target_include_directories( sli_readline PRIVATE
     )
 
 install( TARGETS sli_readline sli_lib sli
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/nest
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/nest
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     )
 
-- 
2.34.1