[OE-core] [master][zeus][PATCH 1/2] libtirpc: Simplify the installation of symlinks for legacy headers

[Peter Kjellerstedt]

This also corrects the symbolic links installed in
/usr/include/rpcsvc.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
---
 .../libtirpc/libtirpc_1.1.4.bb                | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb b/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
index 633cececd4..91e0ce6fd2 100644
--- a/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
+++ b/meta/recipes-extended/libtirpc/libtirpc_1.1.4.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Transport-Independent RPC library"
-DESCRIPTION = "Libtirpc is a port of Suns Transport-Independent RPC library to Linux"
+DESCRIPTION = "Libtirpc is a port of Sun's Transport-Independent RPC library to Linux"
 SECTION = "libs/network"
 HOMEPAGE = "http://sourceforge.net/projects/libtirpc/"
 BUGTRACKER = "http://sourceforge.net/tracker/?group_id=183075&atid=903784"
@@ -22,21 +22,18 @@ inherit autotools pkgconfig
 EXTRA_OECONF = "--disable-gssapi"
 
 do_install_append() {
-        chown root:root ${D}${sysconfdir}/netconfig
-        install -d ${D}${includedir}/rpc
-        install -d ${D}${includedir}/rpcsvc
-        for link_header in ${D}${includedir}/tirpc/rpc/*; do
-            if [ -f $link_header -a ! -e ${D}/${includedir}/rpc/$(basename $link_header) ]; then
-                ln -sf ../tirpc/rpc/$(basename $link_header) ${D}${includedir}/rpc/$(basename $link_header)
-            fi
-        done
-        for link_header in ${D}${includedir}/tirpc/rpcsvc/*; do
-            if [ -f $link_header -a ! -e ${D}/${includedir}/rpcsvc/$(basename $link_header) ]; then
-                ln -sf ../tirpc/rpc/$(basename $link_header) ${D}${includedir}/rpcsvc/$(basename $link_header)
-            fi
-        done
-        ln -sf  tirpc/netconfig.h ${D}/${includedir}/netconfig.h
+	chown root:root ${D}${sysconfdir}/netconfig
 
+	for dir in rpc rpcsvc; do
+		install -d ${D}${includedir}/$dir
+		for link_header in ${D}${includedir}/tirpc/$dir/*; do
+			if [ -f $link_header ] &&
+			   [ ! -e ${D}${includedir}/$dir/$(basename $link_header) ]; then
+				ln -sf ../tirpc/$dir/$(basename $link_header) ${D}${includedir}/$dir/$(basename $link_header)
+			fi
+		done
+	done
+	ln -sf tirpc/netconfig.h ${D}${includedir}/netconfig.h
 }
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.21.0