cwpsu/cwpsu-42-fix-paths.patch

   1 diff --git a/Makefile.config b/Makefile.config
   2 index 3e83b74..607c197 100644
   3 --- a/Makefile.config
   4 +++ b/Makefile.config
   5 @@ -310,7 +310,7 @@ C++FLAGS = -I$I $(OPTC) $(LARGE_FILE_FLAG) $(ENDIANFLAG) $(XDRFLAG)
   6  #LD_LIBRARY_PATH = $(CWPROOT)/lib:/usr/X11R6/LessTif/lib
   7
   8  # under SUN OS and RedHat (and other) Linux  uncomment the next line
   9 -LD_LIBRARY_PATH += $(CWPROOT)/lib:/usr/X11R6/LessTif/lib
  10 +LD_LIBRARY_PATH += $(CWPROOT)/lib
  11
  12  #############################################################################
  13  # the archiver
  14 @@ -445,10 +445,10 @@ include $(CWPROOT)/src/Rules/abbrev.rules
  15  ####
  16  # Generic (RS6000, SGI)
  17  # X11 include path
  18 -IX11 = /usr/local/include
  19 +IX11 = /usr/include
  20
  21  # X11 library path
  22 -LX11 = /usr/local/lib
  23 +LX11 = /usr/lib
  24  ####
  25
  26  ####
  27 @@ -466,10 +466,10 @@ LX11 = /usr/local/lib
  28  ## The following paths would be used under Linux
  29  ## and possibly under SCO Unix installs
  30  # X11 include path
  31 -IX11 = /usr/X11R6/include
  32 +#IX11 = /usr/include
  33
  34  # X11 library path
  35 -LX11 = /usr/X11R6/lib
  36 +#LX11 = /usr/lib
  37
  38
  39  ####
  40 @@ -488,39 +488,39 @@ LX11 = /usr/X11R6/lib
  41  # if you have these include files and libraries.
  42  #
  43  # include path
  44 -IMOTIF = /usr/local/include
  45 +IMOTIF = $(shell sh -c 'motif-config --cflags')
  46
  47  # library path
  48 -LMOTIF = /usr/local/lib
  49 +LMOTIF = $(shell sh -c 'motif-config --libs')
  50
  51  # Example of Lesstif usage:
  52  # include path
  53 -IMOTIF = /usr/local/lesstif/include
  54 +#IMOTIF = /usr/include
  55
  56  # library path
  57 -LMOTIF = /usr/local/lesstif/lib
  58 +#LMOTIF = /usr/lib
  59
  60  #### Example of Lesstif usage under RedHat
  61  # include path
  62 -IMOTIF = /usr/X11R6/LessTif/Motif2.0/include
  63 +#IMOTIF = /usr/X11R6/LessTif/Motif2.0/include
  64
  65  # library path
  66 -LMOTIF = /usr/X11R6/LessTif/Motif2.0/lib
  67 +#LMOTIF = /usr/X11R6/LessTif/Motif2.0/lib
  68
  69
  70  #### Open GL/Mesa include and library paths (generic example)
  71  # Open GL/Mesa include path
  72 -IGL = /usr/local/include
  73 +IGL = $(shell sh -c 'pkg-config --cflags gl')
  74
  75  # Open GL/Mesa library path
  76 -LGL = /usr/local/lib
  77 +LGL = $(shell sh -c 'pkg-config --libs gl')
  78
  79  ## GLUT include and library paths
  80  # include path
  81 -IGLUT = /usr/local/include
  82 +IGLUT = /usr/include
  83
  84  # library path
  85 -LGLUT = /usr/local/lib
  86 +LGLUT = /usr/lib
  87
  88  #### examples for SGI with glut installed in /usr/local/glut-3.3
  89  ## GLUT include and library paths
  90 @@ -540,10 +540,10 @@ LGLUT = /usr/local/lib
  91
  92  #### Red Hat 7.2 Linux  example
  93  ## GLUT include and library paths
  94 -IGLUT = /usr/include
  95 +#IGLUT = /usr/include
  96
  97  # Open GL/Mesa library path
  98 -LGLUT = /usr/lib
  99 +#LGLUT = /usr/lib
 100  ###
 101
 102  ################################################################