1*4882a593SmuzhiyunFrom 575591caf1e8972f765885679b76787ef92de77b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Hongxu Jia <hongxu.jia@windriver.com> 3*4882a593SmuzhiyunDate: Mon, 24 Apr 2017 04:24:10 -0400 4*4882a593SmuzhiyunSubject: [PATCH] libntfs-3g/Makefile.am: fix install failed while host dir not exist 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunWhile cross compiling, if the dir of "$(rootlibdir)" and "$(libdir)" 7*4882a593Smuzhiyun(such as "/usr/lib64") do not exist on host system, the do_instal failed. 8*4882a593Smuzhiyun----------------------- 9*4882a593Smuzhiyunmake[3]: Entering directory `tmp/work/core2-64-wrs-linux/ntfs-3g-ntfsprogs/2017.3.23-r0/build/libntfs-3g' 10*4882a593Smuzhiyunif [ ! "/usr/lib64" -ef "/usr/lib64" ]; then \ 11*4882a593Smuzhiyun mv -f "tmp/work/core2-64-wrs-linux/ntfs-3g-ntfsprogs/2017.3.23-r0/image//usr/lib64"/libntfs-3g.so* \ 12*4882a593Smuzhiyun "tmp/work/core2-64-wrs-linux/ntfs-3g-ntfsprogs/2017.3.23-r0/image//usr/lib64"; \ 13*4882a593Smuzhiyunfi 14*4882a593Smuzhiyunmv:...are the same file 15*4882a593Smuzhiyun----------------------- 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunUse `=' rather than `-ef' to compare them, the cross compile does not 18*4882a593Smuzhiyuncare about host dir. 19*4882a593Smuzhiyun 20*4882a593SmuzhiyunUpstream-Status: Pending 21*4882a593Smuzhiyun 22*4882a593SmuzhiyunSigned-off-by: Hongxu Jia <hongxu.jia@windriver.com> 23*4882a593Smuzhiyun--- 24*4882a593Smuzhiyun libntfs-3g/Makefile.am | 6 +++--- 25*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 3 deletions(-) 26*4882a593Smuzhiyun 27*4882a593Smuzhiyundiff --git a/libntfs-3g/Makefile.am b/libntfs-3g/Makefile.am 28*4882a593Smuzhiyunindex d6b150e..806109d 100644 29*4882a593Smuzhiyun--- a/libntfs-3g/Makefile.am 30*4882a593Smuzhiyun+++ b/libntfs-3g/Makefile.am 31*4882a593Smuzhiyun@@ -59,15 +59,15 @@ endif 32*4882a593Smuzhiyun # And create ldscript or symbolic link from /usr 33*4882a593Smuzhiyun install-exec-hook: install-rootlibLTLIBRARIES 34*4882a593Smuzhiyun if INSTALL_LIBRARY 35*4882a593Smuzhiyun- if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \ 36*4882a593Smuzhiyun+ if [ "$(rootlibdir)" != "$(libdir)" ]; then \ 37*4882a593Smuzhiyun $(MV) -f "$(DESTDIR)/$(libdir)"/libntfs-3g.so* "$(DESTDIR)/$(rootlibdir)"; \ 38*4882a593Smuzhiyun fi 39*4882a593Smuzhiyun if GENERATE_LDSCRIPT 40*4882a593Smuzhiyun- if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \ 41*4882a593Smuzhiyun+ if [ "$(rootlibdir)" != "$(libdir)" ]; then \ 42*4882a593Smuzhiyun $(install_sh_PROGRAM) "libntfs-3g.script.so" "$(DESTDIR)/$(libdir)/libntfs-3g.so"; \ 43*4882a593Smuzhiyun fi 44*4882a593Smuzhiyun else 45*4882a593Smuzhiyun- if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \ 46*4882a593Smuzhiyun+ if [ "$(rootlibdir)" != "$(libdir)" ]; then \ 47*4882a593Smuzhiyun $(LN_S) "$(rootlibdir)/libntfs-3g.so" "$(DESTDIR)/$(libdir)/libntfs-3g.so"; \ 48*4882a593Smuzhiyun fi 49*4882a593Smuzhiyun endif 50*4882a593Smuzhiyun-- 51*4882a593Smuzhiyun2.8.1 52*4882a593Smuzhiyun 53