diff -up nedit-5.5/Makefile.makefiles nedit-5.5/Makefile
--- nedit-5.5/Makefile.makefiles	2004-09-30 22:51:05.000000000 +0200
+++ nedit-5.5/Makefile	2008-01-06 11:07:45.000000000 +0100
@@ -29,7 +29,6 @@ all:
 	   then ln -s ../makefiles/Makefile.$@ .; fi)
 
 	(cd util; \
-	    $(MAKE) -f Makefile.$@ verify_config && \
 	    $(MAKE) -f Makefile.$@ libNUtil.a)
 	(cd Xlt;    $(MAKE) -f Makefile.$@ libXlt.a)
 	(cd Microline/XmL;    $(MAKE) -f Makefile.$@ libXmL.a)
diff -up nedit-5.5/makefiles/Makefile.linux.makefiles nedit-5.5/makefiles/Makefile.linux
--- nedit-5.5/makefiles/Makefile.linux.makefiles	2003-05-20 02:27:56.000000000 +0200
+++ nedit-5.5/makefiles/Makefile.linux	2008-01-06 11:10:31.000000000 +0100
@@ -1,5 +1,5 @@
 # $Id: nedit-5.4-makefiles.patch,v 1.3 2008/01/18 14:34:35 jnovy Exp $
-CC=cc
+CC=gcc
 AR=ar
 
 # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS
@@ -17,11 +17,11 @@ AR=ar
 # To test if the Motif library exports the runtime version
 # add -DHAVE__XMVERSIONSTRING to CFLAGS
 #
-CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
+CFLAGS= $(C_OPT_FLAGS) -DUSE_DIRENT -DUSE_LPR_PRINT_CMD -DBUILD_UNTESTED_NEDIT
 
 ARFLAGS=-urs
 
-LIBS= -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
+LIBS= $(LD_OPT_FLAGS) -lXm -lXmu -lXp -lXpm -lXext -lXt -lSM -lICE -lX11 -lm
 
 include Makefile.common