| 1 |
jlec 11/03/03 14:22:17 |
| 2 |
|
| 3 |
Added: 5.1.4-gentoo.patch |
| 4 |
Log: |
| 5 |
New addition, written by me |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-misc/wcd/files/5.1.4-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/wcd/files/5.1.4-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/wcd/files/5.1.4-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 5.1.4-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/src/Makefile b/src/Makefile |
| 18 |
index 15a889a..9a699b7 100644 |
| 19 |
--- a/src/Makefile |
| 20 |
+++ b/src/Makefile |
| 21 |
@@ -46,14 +46,14 @@ endif |
| 22 |
|
| 23 |
include version.mk |
| 24 |
|
| 25 |
-CC = gcc |
| 26 |
+CC ?= gcc |
| 27 |
STATIC = |
| 28 |
-STRIP = strip |
| 29 |
+STRIP = |
| 30 |
|
| 31 |
ENABLE_NLS = 1 |
| 32 |
|
| 33 |
PACKAGE = wcd |
| 34 |
-EXT = .exe |
| 35 |
+EXT = |
| 36 |
PROGRAM = $(PACKAGE)$(EXT) |
| 37 |
BIN = $(PROGRAM) |
| 38 |
|
| 39 |
@@ -283,7 +283,7 @@ endif |
| 40 |
# dynamically) comment the LDFLAGS line and add the 'libncurses.a' file |
| 41 |
# (often found as /usr/lib/libncurses.a) to the OBJS1 list. |
| 42 |
|
| 43 |
-CFLAGS = -O2 -Wall |
| 44 |
+CFLAGS += -Wall |
| 45 |
|
| 46 |
EXTRA_CFLAGS = -Ic3po \ |
| 47 |
$(CFLAGS_VERSION) \ |
| 48 |
@@ -302,7 +302,7 @@ ifdef ASCII_TREE |
| 49 |
EXTRA_CFLAGS += -DASCII_TREE |
| 50 |
endif |
| 51 |
|
| 52 |
-LDFLAGS = $(LIB_CURSES) \ |
| 53 |
+LIBS = $(LIB_CURSES) \ |
| 54 |
$(LDFLAGS_EXTRA) \ |
| 55 |
$(NLFLAG) |
| 56 |
|
| 57 |
@@ -346,6 +346,7 @@ status: |
| 58 |
@echo "DEFS = $(DEFS)" |
| 59 |
@echo "DEFS_CURSES = $(DEFS_CURSES)" |
| 60 |
@echo "EXTRA_DEFS = $(EXTRA_DEFS)" |
| 61 |
+ @echo "LIBS = $(LIBS)" |
| 62 |
@echo "LDFLAGS = $(LDFLAGS)" |
| 63 |
@echo "LDFLAGS_EXTRA = $(LDFLAGS_EXTRA)" |
| 64 |
@echo "CFLAGS = $(CFLAGS)" |
| 65 |
@@ -355,7 +356,7 @@ status: |
| 66 |
|
| 67 |
$(BIN): $(OBJS1) |
| 68 |
$(MAKE) status |
| 69 |
- $(CC) $(OBJS1) $(LDFLAGS) -o $@ |
| 70 |
+ $(CC) $(OBJS1) $(LDFLAGS) -o $@ $(LIBS) |
| 71 |
|
| 72 |
%.o: %.c |
| 73 |
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@ |
Archives