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
|
--- tcb-1.0/libs/Makefile
+++ tcb-1.0/libs/Makefile
@@ -17,13 +17,13 @@
$(CC) $(CFLAGS) $(DBGFLAG) -c $< -o $@
$(LIBTCB_LONG): libtcb.o $(LIB_MAP)
- $(CC) $(DBGFLAG) -shared -o $@ -Wl,-soname,$(LIBTCB) \
+ $(CC) $(CFLAGS) $(LDFLAGS) $(DBGFLAG) -shared -o $@ -Wl,-soname,$(LIBTCB) \
-Wl,--version-script=$(LIB_MAP) $< -lc
ln -sf $@ $(LIBTCB)
ln -sf $(LIBTCB) libtcb.so
$(LIBNSS): nss.o $(NSS_MAP) $(LIBTCB_LONG)
- $(CC) $(DBGFLAG) -shared -o $@ -Wl,--version-script=$(NSS_MAP) \
+ $(CC) $(CFLAGS) $(LDFLAGS) $(DBGFLAG) -shared -o $@ -Wl,-soname,$@ -Wl,--version-script=$(NSS_MAP) \
$< -L. $(LIBNSL) -ltcb
.c.o:
--- tcb-1.0/Make.defs
+++ tcb-1.0/Make.defs
@@ -8,9 +8,9 @@
LDFLAGS += $(DBGFLAG) -L../libs
SBINDIR = /sbin
-SLIBDIR = /lib
-LIBDIR = /usr/lib
-LIBEXECDIR = /usr/libexec
-MANDIR = /usr/man
+SLIBDIR = /@GENTOO_LIBDIR@
+LIBDIR = /usr/@GENTOO_LIBDIR@
+LIBEXECDIR = $(LIBDIR)/misc
+MANDIR = /usr/share/man
SHLIBMODE = 755
--- tcb-1.0/progs/Makefile
+++ tcb-1.0/progs/Makefile
@@ -7,13 +7,13 @@
all: $(CONVERT) $(UNCONVERT) $(CHKPWD)
$(CONVERT): $(CONVERT).o
- $(CC) -o $@ $<
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
$(UNCONVERT): $(UNCONVERT).o
- $(CC) -o $@ $< -L../libs -ltcb
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L../libs -ltcb
$(CHKPWD): $(CHKPWD).o
- $(CC) -o $@ $< -lcrypt
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lcrypt
.c.o:
$(CC) $(CFLAGS) -c $< -o $@
|
GitWeb
