1*4882a593SmuzhiyunFrom 7535d990645d867a6e491d16cd2548ea7e54958e Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 5 Apr 2021 16:21:32 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Makefile.in: fix cross-compilation 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun- Use DESTDIR to install each files instead of prepending prefix with it 7*4882a593Smuzhiyun as this will result in dotlockfile being wrongly install in $(bindir) 8*4882a593Smuzhiyun- Use -f when creating symlink to avoid an error if link already exists 9*4882a593Smuzhiyun- Do not install files with root group as this will break 10*4882a593Smuzhiyun cross-compilation 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 13*4882a593Smuzhiyun[Upstream status: https://github.com/miquels/liblockfile/pull/11] 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun Makefile.in | 36 ++++++++++++++++++------------------ 16*4882a593Smuzhiyun 1 file changed, 18 insertions(+), 18 deletions(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/Makefile.in b/Makefile.in 19*4882a593Smuzhiyunindex 9c74b35..5ce8153 100644 20*4882a593Smuzhiyun--- a/Makefile.in 21*4882a593Smuzhiyun+++ b/Makefile.in 22*4882a593Smuzhiyun@@ -10,7 +10,7 @@ CFLAGS = @CFLAGS@ -I. 23*4882a593Smuzhiyun LDFLAGS = @LDFLAGS@ 24*4882a593Smuzhiyun CC = @CC@ 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun-prefix = $(DESTDIR)@prefix@ 27*4882a593Smuzhiyun+prefix = @prefix@ 28*4882a593Smuzhiyun exec_prefix = @exec_prefix@ 29*4882a593Smuzhiyun bindir = @bindir@ 30*4882a593Smuzhiyun libdir = @libdir@ 31*4882a593Smuzhiyun@@ -60,34 +60,34 @@ dlockfile.o: lockfile.c 32*4882a593Smuzhiyun -c lockfile.c -o dlockfile.o 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun install_static: static install_common 35*4882a593Smuzhiyun- install -d -m 755 -g root -p $(libdir) 36*4882a593Smuzhiyun- install -m 644 liblockfile.a $(libdir) 37*4882a593Smuzhiyun+ install -d -m 755 -p $(DESTDIR)$(libdir) 38*4882a593Smuzhiyun+ install -m 644 liblockfile.a $(DESTDIR)$(libdir) 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun install_shared: shared install_static install_common 41*4882a593Smuzhiyun- install -d -m 755 -g root -p $(libdir) 42*4882a593Smuzhiyun+ install -d -m 755 -p $(DESTDIR)$(libdir) 43*4882a593Smuzhiyun install -m 755 liblockfile.so \ 44*4882a593Smuzhiyun- $(libdir)/liblockfile.so.$(SOVER) 45*4882a593Smuzhiyun- ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR) 46*4882a593Smuzhiyun- ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so 47*4882a593Smuzhiyun+ $(DESTDIR)$(libdir)/liblockfile.so.$(SOVER) 48*4882a593Smuzhiyun+ ln -sf liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so.$(MAJOR) 49*4882a593Smuzhiyun+ ln -sf liblockfile.so.$(SOVER) $(DESTDIR)$(libdir)/liblockfile.so 50*4882a593Smuzhiyun if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun install_common: 53*4882a593Smuzhiyun- install -d -m 755 -g root -p $(includedir) 54*4882a593Smuzhiyun- install -d -m 755 -g root -p $(bindir) 55*4882a593Smuzhiyun- install -d -m 755 -g root -p $(mandir)/man1 56*4882a593Smuzhiyun- install -d -m 755 -g root -p $(mandir)/man3 57*4882a593Smuzhiyun- install -m 644 lockfile.h maillock.h $(includedir) 58*4882a593Smuzhiyun+ install -d -m 755 -p $(DESTDIR)$(includedir) 59*4882a593Smuzhiyun+ install -d -m 755 -p $(DESTDIR)$(bindir) 60*4882a593Smuzhiyun+ install -d -m 755 -p $(DESTDIR)$(mandir)/man1 61*4882a593Smuzhiyun+ install -d -m 755 -p $(DESTDIR)$(mandir)/man3 62*4882a593Smuzhiyun+ install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir) 63*4882a593Smuzhiyun if [ "$(MAILGROUP)" != "" ]; then\ 64*4882a593Smuzhiyun- install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\ 65*4882a593Smuzhiyun+ install -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\ 66*4882a593Smuzhiyun else \ 67*4882a593Smuzhiyun- install -g root -m 755 dotlockfile $(bindir); \ 68*4882a593Smuzhiyun+ install -m 755 dotlockfile $(DESTDIR)$(bindir); \ 69*4882a593Smuzhiyun fi 70*4882a593Smuzhiyun- install -m 644 *.1 $(mandir)/man1 71*4882a593Smuzhiyun- install -m 644 *.3 $(mandir)/man3 72*4882a593Smuzhiyun+ install -m 644 *.1 $(DESTDIR)$(mandir)/man1 73*4882a593Smuzhiyun+ install -m 644 *.3 $(DESTDIR)$(mandir)/man3 74*4882a593Smuzhiyun 75*4882a593Smuzhiyun install_nfslib: nfslib 76*4882a593Smuzhiyun- install -d -m 755 -g root -p $(nfslockdir) 77*4882a593Smuzhiyun- install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) 78*4882a593Smuzhiyun+ install -d -m 755 -p $(DESTDIR)$(nfslockdir) 79*4882a593Smuzhiyun+ install -m 755 nfslock.so.$(NFSVER) $(DESTDIR)$(nfslockdir) 80*4882a593Smuzhiyun if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi 81*4882a593Smuzhiyun 82*4882a593Smuzhiyun test: test-stamp 83