Ticket #50810: patch-cgx-build.diff

CalculiX/cgx_2.10/src

@@ -1 @@
-CFLAGS = -O3 -Wall \
+CFLAGS = \
   -I./ \
   -I/usr/include \
   -I/usr/include/GL \
@@ -7 +7 @@
   -I/usr/X11/include 
 
 LFLAGS = \
-  -L/usr/lib64 -lGL -lGLU \
-  -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
-  -lm -lpthread -lrt
+  -L/usr/lib -lGL -lGLU \
+  -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE 
 
 
 # on 32bit systems change lib64 to lib
@@ -66 +65 @@
 OUTIL = $(SUTIL:.c=.o)
 
 cgx: $(OLIB) $(OUTIL) $(OULIB)
-        g++  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
+        $(CXX)  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
 
 
 

CalculiX/cgx_2.10/src

@@ -79 +79 @@
                              "/yaprod/cae/application/CalculiX/doc/ccx_2.10/ccx.html"}
   #endif
 #elif defined AFLIB
-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
-    "/usr/local/CalculiX/ccx_2.10/doc/ccx/ccx.html",\
-    "/usr/local/CalculiX/cgx_2.10/doc/aflib/aflib.pdf"}
+  #define     HELPFILE        {"@@PREFIX@@/share/doc/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
+    "@@PREFIX@@/share/doc/CalculiX/ccx_2.10/doc/ccx/ccx.html",\
+    "@@PREFIX@@/share/doc/CalculiX/cgx_2.10/doc/aflib/aflib.pdf"}
 #else
-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
-    "/usr/local/CalculiX/ccx_2.10/doc/ccx/ccx.html"}
+  #define     HELPFILE        {"@@PREFIX@@/share/doc/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
+    "@@PREFIX@@/share/doc/CalculiX/ccx_2.10/doc/ccx/ccx.html"}
 #endif
 
 /* html browser, change if necessary */
@@ -95 +95 @@
 #else
 /* #define     BROWSER         {"netscape"} */
 /*   #define     BROWSER         {"mozilla"} */
-  #define     BROWSER         {"firefox"}
+  #define     BROWSER         {"openbrowser"}
 /* #define     PSVIEWER         {"ghostview"} */
-  #define     PSVIEWER         {"gv"}
+  #define     PSVIEWER         {"open"}
 #endif
 
 /* more parameters, better do not change them! */