gentoo-overlay/app-misc/nut/files/nut-17.7-makefile.patch

--- a/Makefile
+++ b/Makefile
@@ -8,15 +8,6 @@
 EXECUTABLE := nut
 LIBS := -lm
 
-FLTK_CONFIG := $(shell fltk-config --version 2>/dev/null)
-ifeq ($(FLTK_CONFIG),)
-HAVE_FLTK = 0
-FLTK_NUT =
-else
-HAVE_FLTK = 1
-FLTK_NUT = fltk/Nut
-endif
-
 OS := $(shell uname -s)
 ifeq ($(OS),HP-UX)
 CC = cc
@@ -25,7 +16,7 @@
 OPT = -O1
 endif
 
-CFLAGS := $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
+CFLAGS += -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
 ifeq ($(CC),gcc)
 CFLAGS += $(OPT) -Wall -fno-inline -ansi
 endif
@@ -38,7 +29,7 @@
 all: nut $(FLTK_NUT)
 
 nut:	$(OBJS)
-	$(CC) $(OPT) -o $(EXECUTABLE) $(OBJS) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
 
 ifeq ($(HAVE_FLTK),1)
 $(FLTK_NUT):
--- a/fltk/Makefile
+++ b/fltk/Makefile
@@ -5,7 +5,7 @@
 NUTDIR := \".nutdb\"
 FOODDIR := \"$(libdir)\"
 EXECUTABLE := Nut
-LIBS := `fltk-config --ldflags`
+LIBS := $(shell fltk-config --ldflags)
 
 OS := $(shell uname -s)
 ifeq ($(OS),HP-UX)
@@ -16,11 +16,7 @@
 OPT = -Os
 endif
 
-CFLAGS := -I.. `fltk-config --optim --cflags` $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
-
-ifeq ($(CXX),g++)
-CFLAGS := -I.. `fltk-config --optim --cflags` -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -Wall -fno-inline -ansi
-endif
+CFLAGS := -I.. $(shell fltk-config --optim --cflags) $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -Wall -fno-inline -ansi
 
 CXXFLAGS := $(CFLAGS)
 
@@ -28,7 +24,7 @@
 OBJS := ../anameal.o ../db.o ../food.o ../meal.o ../options.o ../prtmenu.o ../recmeal.o ../util.o $(patsubst %.cc,%.o,$(SOURCE))
 
 nut:	$(OBJS)
-	$(CXX) $(OPT) -o $(EXECUTABLE) $(OBJS) $(LIBS)
+	$(CXX) $(CFLAGS) $(LDFLAGS) -o $(EXECUTABLE) $(OBJS) $(LIBS)
 
 deps:
 	makedepend -Y.. ../anameal.c ../db.c ../food.c ../meal.c ../options.c ../prtmenu.c ../recmeal.c ../util.c *.cc >/dev/null 2>&1