diff -ur cgx_2.18.orig/src/Makefile cgx_2.18/src/Makefile
--- cgx_2.18.orig/src/Makefile	2022-07-19 16:37:22.000000000 -0500
+++ cgx_2.18/src/Makefile	2022-07-20 06:28:44.000000000 -0500
@@ -1,15 +1,15 @@
 CFLAGS = -O2 -Wall -Wno-narrowing \
   -I./ \
-  -I/usr/include \
-  -I/usr/include/GL \
+  -I/opt/X11/include \
+  -I/opt/X11/include/GL \
   -I../../libSNL/src \
   -I../../glut-3.5/src \
-  -I/usr/X11/include 
+  -I/opt/X11/include/X11 
 
 LFLAGS = \
-  -L/usr/lib64 -lGL -lGLU \
-  -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
-  -lm -lpthread -lrt
+  -L/opt/X11/lib -lGL -lGLU \
+  -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
+  -lm -lpthread
 
 
 # on 32bit systems change lib64 to lib
@@ -66,7 +66,7 @@
 OUTIL = $(SUTIL:.c=.o)
 
 cgx: $(OLIB) $(OUTIL) $(OULIB)
-	g++  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
+	$(CXX)  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
 
 
 
diff -ur cgx_2.18.orig/src/cgx.h cgx_2.18/src/cgx.h
--- cgx_2.18.orig/src/cgx.h	2022-07-19 16:37:22.000000000 -0500
+++ cgx_2.18/src/cgx.h	2022-07-20 06:37:54.000000000 -0500
@@ -88,8 +88,8 @@
   /* default tet mesher, 0:Netgen ng_vol, 1:tetgen */
   #define     TETMESHER  1
 #else
-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.18/doc/cgx/cgx.html",\
-    "/usr/local/CalculiX/ccx_2.18/doc/ccx/ccx.html"}
+  #define     HELPFILE        {"@@PREFIX@@/share/doc/CalculiX/cgx/cgx.html",\
+    "@@PREFIX@@/share/doc/CalculiX/ccx/ccx.html"}
   /* default tet mesher, 0:Netgen ng_vol, 1:tetgen */
   #define     TETMESHER  1
 #endif
@@ -105,9 +105,9 @@
 #else
 /* #define     BROWSER         {"netscape"} */
 /*   #define     BROWSER         {"mozilla"} */
-  #define     BROWSER         {"firefox"}
+  #define     BROWSER         {"openbrowser"}
 /* #define     PSVIEWER         {"ghostview"} */
-  #define     PSVIEWER         {"gv"}
+  #define     PSVIEWER         {"open"}
   #define     ALLOW_SYS_FLAG   0
 #endif
 
diff -ur cgx_2.18.orig/src/pickFunktions.c cgx_2.18/src/pickFunktions.c
--- cgx_2.18.orig/src/pickFunktions.c	2022-07-19 16:37:22.000000000 -0500
+++ cgx_2.18/src/pickFunktions.c	2022-07-19 16:41:13.000000000 -0500
@@ -4594,7 +4594,7 @@
     else
     {
       printf("ERROR: selected point:%s is no line endpoint\n", point[pntNr].name);
-      return(-1);
+      return;
     }
     u=flag*llength;
     u/=scale->w;