From 322226dbf877e1db6e7cd7a3d7f15c18121e9d54 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Tue, 4 Jul 2017 12:17:11 +0000
Subject: [PATCH] Do not export the wrapInstall function when porg style is not
 in use

---
 common/libs/func_wrt_Makefile | 1 +
 common/makefile-functions     | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/libs/func_wrt_Makefile b/common/libs/func_wrt_Makefile
index 49c5bab..b9dd146 100644
--- a/common/libs/func_wrt_Makefile
+++ b/common/libs/func_wrt_Makefile
@@ -45,6 +45,7 @@ ADD_REPORT       = $REPORT
 ADD_CUSTOM_TOOLS = $CUSTOM_TOOLS
 ADD_BLFS_TOOLS   = $BLFS_TOOL
 PKGMNGT          = $PKGMNGT
+WRAP_INSTALL     = $WRAP_INSTALL
 
 
 export PATH := \${PATH}:/usr/sbin
diff --git a/common/makefile-functions b/common/makefile-functions
index 9e34161..8126986 100644
--- a/common/makefile-functions
+++ b/common/makefile-functions
@@ -115,7 +115,9 @@ define get_pkg_root2
     echo "export PKG_DEST=$(SRC)/$@" >> envars; \
     echo "source packInstall.sh" >> envars; \
     echo "export -f packInstall" >> envars; \
-    echo "export -f wrapInstall" >> envars; \
+    if [ "$(WRAP_INSTALL)" = "y" ]; then \
+      echo "export -f wrapInstall" >> envars; \
+    fi; \
   fi;
 endef