blob: 8ac61aa55d1ccf20ecd81d2044f43fb9ca9e1f78 (
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
|
From db9b4be854bb9a84319b81ce0afecd98f4f84ff7 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 27 Feb 2023 08:28:21 +0000
Subject: [PATCH] Makefile.in: fix install failure on host without ldconfig
fix syntax error when ldconfig is not installed on host
when ldconfig is not installed on the build host, install will failed with
error:
ln -sf nfslock.so.0.1 /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/lib64/nfslock.so.0
install -m 644 lockfile.h maillock.h /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/include
if test "/mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image" = ""; then ; fi
if [ "mail" != "" ]; then\
install -g mail -m 2755 dotlockfile /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/bin;\
else \
install -g root -m 755 dotlockfile /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/bin; \
fi
/bin/sh: -c: line 1: syntax error near unexpected token `;'
/bin/sh: -c: line 1: `if test "/mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image" = ""; then ; fi'
Upstream-Status: Submitted [https://github.com/miquels/liblockfile/pull/21]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
Makefile.in | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 6e53179..d003899 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,10 @@ NFSVER = 0.1
CFLAGS = @CFLAGS@ -I.
LDFLAGS = @LDFLAGS@
CC = @CC@
+LDCONFIG = @LDCONFIG@
+ifeq ($(LDCONFIG),)
+ LDCONFIG = ":"
+endif
prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
@@ -58,7 +62,7 @@ install_shared: shared install_static install_common
$(libdir)/liblockfile.so.$(SOVER)
ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so
- if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
+ if test "$(DESTDIR)" = ""; then $(LDCONFIG); fi
install_common:
install -d -m 755 -g root -p $(includedir)
@@ -79,7 +83,7 @@ install_nfslib: nfslib
install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so
ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0
- if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
+ if test "$(DESTDIR)" = ""; then $(LDCONFIG); fi
clean:
rm -f *.a *.o *.so *.so.* dotlockfile
--
2.25.1
|
