blob: d04d7f6f4aaa80c3f3de3b363bee2a6324d4e6d8 (
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
|
diff --git vzctl-3.0.12.orig/src/Makefile vzctl-3.0.12/src/Makefile
index a8be2d2..2c3adbc 100644
--- vzctl-3.0.12.orig/src/Makefile
+++ vzctl-3.0.12/src/Makefile
@@ -17,7 +17,7 @@ #
INSTALL = install
PREFIX = /usr
SBINDIR = $(PREFIX)/sbin
- LIBDIR = $(PREFIX)/lib/vzctl/lib
+ LIBDIR = $(PREFIX)/lib64
CONFDIR = /etc/vz
GLBCONFIG = $(CONFDIR)/vz.conf
VPSCONFDIR = $(CONFDIR)/conf
@@ -64,7 +64,6 @@ LIB_vzctl = libvzctl.so.$(LIB_VER)
LIB_simfs = libvzctl-simfs.so.$(LIB_VER)
LIB_fs = $(LIB_simfs)
-LDFLAGS += -Wl,-rpath=$(LIBDIR)
LIBSCRIPTS = vps-create vps-postcreate vps-net_add vps-net_del vps-stop \
vps-functions
@@ -103,14 +102,14 @@ check-version:
$(CC) -c $(CFLAGS) $(SHAREDLIB_CFLAGS) $(INC) $< -o $@
$(LIB_fs) : $(OBJ_simfs) lib/logger.lo
- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ -shared -o $@
+ $(CC) $(CFLAGS) $(INC) $(LDFLAGS) -shared --Wl,-soname,$@ -o $@ $^
libvzctl.a: $(OBJ_libvzctl) $(OBJ_simfs)
ar scq $@ $+
ranlib $@
$(LIB_vzctl) : $(OBJ_simfs) $(OBJ_libvzctl)
- $(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ $(LD_FLAGS) -shared -o $@
+ $(CC) $(CFLAGS) $(INC) $(LDFLAGS) -shared --Wl,-soname,$@ -o $@ $^
vzctl-static: $(OBJ_vzctl) libvzctl.a
$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ -rdynamic -ldl -lutil -o $@
|
GitWeb
