patch-1.3.71 linux/scripts/lxdialog/Makefile

Next file: linux/scripts/lxdialog/checklist.c
Previous file: linux/scripts/README.Menuconfig
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.70/linux/scripts/lxdialog/Makefile linux/scripts/lxdialog/Makefile
@@ -2,25 +2,24 @@
 CPP = gcc -E
 OPTIM = -O2 -Wall -fomit-frame-pointer
 
-CFLAGS = $(OPTIM) $(CURSES) -DLOCALE 
+CFLAGS = $(OPTIM) -DLOCALE 
 LDFLAGS = -s -L .
 LDLIBS = -lncurses
 
-CURSES =  -DCURSES_LOC="<curses.h>"
-
 ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
-        CFLAGS += -I/usr/include/ncurses
-        CURSES =  -DCURSES_LOC="<ncurses.h>"
+        CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
 else
 ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h))
-        CFLAGS += -I/usr/include/ncurses
-        CURSES =  -DCURSES_LOC="<curses.h>"
+        CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<curses.h>"
 else
 ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
-        CURSES =  -DCURSES_LOC="<ncurses.h>"
+        CFLAGS += -DCURSES_LOC="<ncurses.h>"
+else
+	CFLAGS += -DCURSES_LOC="<curses.h>"
 endif
 endif
 endif
+
 
 OBJS = checklist.o menubox.o textbox.o yesno.o inputbox.o \
        util.o lxdialog.o msgbox.o

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this