1From 05227e74b732f13ed5a2a98232676f98bba028e6 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Fri, 12 Aug 2022 11:18:15 +0800
4Subject: [PATCH] Makefile.in: redefine LOCKPROG
5
6By default the LOCKPROG will be expanded as below:
7LOCKPROG="/build/tmp-glibc/work/core2-32-wrs-linux/liblockfile/1.14-r0/image/usr/bin/dotlockfile"
8
9And it should be "/usr/bin/dotlockfile" on the target.
10
11Upstream-Status: Inappropriate [oe specific]
12
13Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
14
15Update patch for 1.17, also redefine LOCKPROG in other lines
16Signed-off-by: Changqing Li <changqing.li@windriver.com>
17---
18 Makefile.in | 8 ++++----
19 1 file changed, 4 insertions(+), 4 deletions(-)
20
21diff --git a/Makefile.in b/Makefile.in
22index e447cb2..e02d75e 100644
23--- a/Makefile.in
24+++ b/Makefile.in
25@@ -44,19 +44,19 @@ dotlockfile:	dotlockfile.o dlockfile.o
26 		$(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o dlockfile.o
27
28 dotlockfile.o:	dotlockfile.c
29-		$(CC) $(CFLAGS) -DLOCKPROG=\"$(bindir)/dotlockfile\" \
30+		$(CC) $(CFLAGS) -DLOCKPROG=\"/usr/bin/dotlockfile\" \
31 			-c dotlockfile.c
32
33 lockfile.o:	lockfile.c
34-		$(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"$(bindir)/dotlockfile\" \
35+		$(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"/usr/bin/dotlockfile\" \
36 			-DSTATIC -c lockfile.c
37
38 solockfile.o:	lockfile.c
39-		$(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"$(bindir)/dotlockfile\" \
40+		$(CC) $(CFLAGS) -DLIB -DLOCKPROG=\"/usr/bin/dotlockfile\" \
41 			-c lockfile.c -o solockfile.o
42
43 dlockfile.o:	lockfile.c
44-		$(CC) $(CFLAGS) -DLOCKPROG=\"$(bindir)/dotlockfile\" \
45+		$(CC) $(CFLAGS) -DLOCKPROG=\"/usr/bin/dotlockfile\" \
46 			-c lockfile.c -o dlockfile.o
47
48 install_static:	static install_common
49--
502.25.1
51
52