[PATCH] xfsprogs: fix syntax error in include/buildmacros

[PATCH] xfsprogs: fix syntax error in include/buildmacros

[Eryu Guan]

There's an extra ";" in include/buildmacros, which causes make
install-dev to fail

    ......
    Installing libhandle-install-dev
    cd ../libhandle/.libs; ... if [ "x/usr/lib64" != "x/usr/lib64"; ]; ...
    /bin/sh: line 0: [: missing `]'
    /bin/sh: ]: command not found
    ......

This was introduced by
02ef543 libhandle: fix installation for symlinked /usr

Signed-off-by: Eryu Guan <eguan@redhat.com>
---
 include/buildmacros | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/buildmacros b/include/buildmacros
index 4e4e8fa..a7c5d8a 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -77,7 +77,7 @@ INSTALL_LTLIB_DEV = \
 	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
 	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
 	if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
-	     "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))"; ]; then \
+	     "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
 		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
 		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
 		../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
-- 
2.4.3

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfsprogs: fix syntax error in include/buildmacros

[Christoph Hellwig]

On Tue, Aug 04, 2015 at 11:38:29AM +0800, Eryu Guan wrote:
> There's an extra ";" in include/buildmacros, which causes make
> install-dev to fail
> 
>     ......
>     Installing libhandle-install-dev
>     cd ../libhandle/.libs; ... if [ "x/usr/lib64" != "x/usr/lib64"; ]; ...
>     /bin/sh: line 0: [: missing `]'
>     /bin/sh: ]: command not found
>     ......
> 
> This was introduced by
> 02ef543 libhandle: fix installation for symlinked /usr

Thanks, loosk like some shells are stricter than others here.

Reviewed-by: Christoph Hellwig <hch@lst.de>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs