From 5d0e69c7ed987f39df735b2e95ae66c9e700ab60 Mon Sep 17 00:00:00 2001
From: Monty Montgomery <xiphmont@gmail.com>
Date: Sun, 15 May 2022 00:24:40 -0400
Subject: [PATCH] Alter name use of 'netgen' and 'netgen-mesher'

The name of the 'netgen' executable collides with an older UNIX pcb
trace routing application also named 'netgen'.  Fedora, for this
reason, renames this mesher package to 'netgen-mesher' and the
executable, likewise, to 'netgen-mesher'.  I propose the same change
here.

Ironically though, the current python module is already named
'netgen-mesher', which complicates loading of the module as 'netgen',
often resulting in it being unfindable.  For this reason, I similarly
reverse the usage, renaming the python module from 'netgen-mesher' to
'netgen'.
---
 CMakeLists.txt   | 2 +-
 ng/ngtesting.tcl | 4 ++--
 setup.py         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a27f793..35c6f623 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,7 @@ if(USE_PYTHON)
     file(TO_CMAKE_PATH ${PYTHON_PACKAGES_INSTALL_DIR} PYTHON_PACKAGES_INSTALL_DIR)
 endif(USE_PYTHON)
 
-set(NG_INSTALL_SUFFIX netgen CACHE STRING "Suffix appended to install directories (project name)")
+set(NG_INSTALL_SUFFIX netgen-mesher CACHE STRING "Suffix appended to install directories (project name)")
 
 if(APPLE)
   set(NG_INSTALL_DIR_BIN_DEFAULT Contents/MacOS)
diff --git a/ng/ngtesting.tcl b/ng/ngtesting.tcl
index 24b58983..a2c6f0ca 100644
--- a/ng/ngtesting.tcl
+++ b/ng/ngtesting.tcl
@@ -64,7 +64,7 @@ proc ngtest { {t all} {f ""}} {
     }  
   
     puts "\n ** testing in2d files in tutorials/ **"
-    set testdir "$::ngdir/../share/netgen"
+    set testdir "$::ngdir/../share/netgen-mesher"
     set in2dfiles { demo2d  newin2d  square  v2in2d }
     foreach {tfile} $in2dfiles {
       if {$f != ""} { puts "  * meshing file tutorials/$tfile.in2d..." }
@@ -89,7 +89,7 @@ proc ngtest { {t all} {f ""}} {
     } 
   
     puts "\n ** testing geo files in tutorials/ **"
-    set testdir "$::ngdir/../share/netgen"
+    set testdir "$::ngdir/../share/netgen-mesher"
     set geofiles { boxcyl          cubemcyl     extrusion  revolution    trafo
                    circle_on_cube  cubemsphere  fichera    sculpture     twobricks
                    cone            cylinder     lshape3d   shaft         twocubes
diff --git a/setup.py b/setup.py
index 0ed33a6d..e6b48cfc 100644
--- a/setup.py
+++ b/setup.py
@@ -36,7 +36,7 @@ else:
 
 py_install_dir = get_python_lib(1,0,'').replace('\\','/')
 
-name = "netgen-mesher"
+name = "netgen"
 arch = None
 cmake_args = [
         f'-DNETGEN_VERSION_GIT={git_version}',