From fad566de99eb628c52b02b9e916cf7bc0607e11f Mon Sep 17 00:00:00 2001
From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Tue, 22 Sep 2009 17:51:13 +0200
Subject: [PATCH] makefile_bertw: make openmotif path fit for versions >= 2.3.1

---
 makefile_bertw.patch | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/makefile_bertw.patch b/makefile_bertw.patch
index 5030bce..088a635 100644
--- a/makefile_bertw.patch
+++ b/makefile_bertw.patch
@@ -5,12 +5,13 @@ Subject: my local make target
  makefiles/Makefile.bertw |   57 +++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 57 insertions(+)
 
-diff --quilt /dev/null new/makefiles/Makefile.bertw
---- /dev/null
-+++ new/makefiles/Makefile.bertw
-@@ -0,0 +1,57 @@
+Index: nedit/makefiles/Makefile.bertw
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ nedit/makefiles/Makefile.bertw	2009-08-07 11:26:53.000000000 +0200
+@@ -0,0 +1,65 @@
 +# $Id: Makefile.linux,v 1.11 2003/05/20 00:27:56 n8gray Exp $
-+CC=gcc
++CC=gcc -U_FORTIFY_SOURCE
 +AR=ar
 +
 +# For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS
@@ -58,9 +59,17 @@ diff --quilt /dev/null new/makefiles/Makefile.bertw
 +LIBS += -lXm -lXmu -lXp -lXext -lXt -lSM -lICE -lX11 -lm
 +
 +ifdef OM231
-+  CFLAGS += -I/home/$(USER)/opt/openmotif-2.3.1/include
-+  LIBS += -Wl,-R,/home/$(USER)/opt/openmotif-2.3.1/lib
-+  LIBS += -L/home/$(USER)/opt/openmotif-2.3.1/lib
++OM23=1
++endif
++
++ifdef OM232
++OM23=2
++endif
++
++ifdef OM23
++  CFLAGS += -I/home/$(USER)/opt/openmotif-2.3.$(OM23)/include
++  LIBS += -Wl,-R,/home/$(USER)/opt/openmotif-2.3.$(OM23)/lib
++  LIBS += -L/home/$(USER)/opt/openmotif-2.3.$(OM23)/lib
 +endif
 +
 +include Makefile.common
-- 
2.11.4.GIT