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
|
--- Makefile.in.orig 2005-08-16 10:00:02.000000000 +0200
+++ Makefile.in 2005-08-16 10:00:35.000000000 +0200
@@ -79,7 +79,7 @@
MV = @MV@
RM = @RM@
RMF = @RM@ -f
-MKDIR = @MKDIR@
+MKDIR = @MKDIR@ -p
FIND = @FIND@
XARGS = @XARGS@
LDCONFIG = @LDCONFIG@
@@ -135,20 +135,6 @@
@(if [ -d $(LIBDIR) ] && [ -w $(LIBDIR) ]; then \
echo "$(INSTALL_LIB) $(LIB_STATIC) $(LIBDIR)"; \
$(INSTALL_LIB) $(LIB_STATIC) $(LIBDIR); \
- if [ `uname` = "Linux" ]; then \
- if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \
- echo "" > /dev/null; \
- elif grep -q $(LIBDIR) /etc/ld.so.conf > /dev/null 2>&1; then \
- echo "" > /dev/null; \
- else \
- echo "Unable to find $(LIBDIR) in ld.so.conf. In order to use "; \
- echo "$(LIB_STATIC), you may need to add it or set LD_LIBRARY_PATH."; \
- fi; \
- if test -w /etc; then \
- echo "$(LDCONFIG)"; \
- $(LDCONFIG); \
- fi; \
- fi ;\
fi \
)
@@ -161,18 +147,6 @@
$(RM) -f $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR); \
$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
- if test `uname` = "Linux"; then \
- if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \
- echo "" > /dev/null; \
- elif grep -q $(LIBDIR) /etc/ld.so.conf > /dev/null 2>&1; then \
- echo "" > /dev/null; \
- else \
- echo "Unable to find $(LIBDIR) in ld.so.conf. In order to use "; \
- echo "$(LIB_SHARED), you may need to add it or set LD_LIBRARY_PATH."; \
- fi; \
- echo "$(LDCONFIG)"; \
- $(LDCONFIG); \
- fi \
)
install.cyg:
@@ -393,8 +366,8 @@
$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
$(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h
- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
- $(LIB_OBJS)
+ $(CC) -shared $(USER_LD_FLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
+ $(LIB_OBJS) $(LIBRARIES)
install.man:
@if [ -d doc/man ] ; then \
|
GitWeb
