summaryrefslogtreecommitdiff
blob: aa164ce9b14d82af90be993dd6e091d8a9a40abf (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
--- a/src/Makefile
+++ b/src/Makefile
@@ -46,12 +46,12 @@
 
 CC		?= gcc
 STATIC		=
-STRIP		= strip
+STRIP		=
 
 ENABLE_NLS = 1
 
 PACKAGE		= wcd
-EXT		= .exe
+EXT		=
 PROGRAM         = $(PACKAGE)$(EXT)
 BIN		= $(PROGRAM)
 
@@ -334,9 +334,9 @@
 # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
 
 ifdef UCS
-	CURSES = ncursesw
+	CURSES = $(shell ${PKG_CONFIG} --libs ncursesw)
 else
-	CURSES = ncurses
+	CURSES = $(shell ${PKG_CONFIG} --libs ncurses)
 endif
 
 
@@ -366,7 +366,7 @@
 
 ifneq (,$(CURSES))
 	DEFS_CURSES = -DWCD_USECURSES
-	LIB_CURSES  = -l$(CURSES)
+	LIB_CURSES  = $(CURSES)
 ifeq (os/2,$(OS))
 	LIB_CURSES  += -ltinfo
 endif
@@ -456,15 +456,15 @@
 endif
 
 LDFLAGS_USER   =
-LDFLAGS		= $(RPM_OPT_FLAGS) \
+LIBS		= $(RPM_OPT_FLAGS) \
 	          $(LDFLAGS_EXTRA) \
 		  $(NLFLAG) \
 		  $(LDFLAG_STATIC) \
 		  $(LDFLAGS_USER)
 
-LIBS = $(LIB_CURSES) \
-       $(LIB_UNISTRING) \
-       $(LIBS_EXTRA)
+LIBS += $(LIB_CURSES) \
+	$(LIB_UNISTRING) \
+	$(LIBS_EXTRA)
 
 DEFS_USER   =
 DEFS		= $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
@@ -521,7 +521,7 @@
 
 $(BIN): $(OBJS1)
 	$(MAKE) status
-	$(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@