+#!/bin/bash -e -x
 # exit immediately on failure
-set -e -x
-
-# check if we're building for the simulator
-if [ "${RC_ProjectName%_Sim}" != "${RC_ProjectName}" ] ; then
-       if [ -d ${DSTROOT}${SDKROOT}/usr/lib/system ] ; then
-               for lib in ${DSTROOT}${SDKROOT}/usr/lib/system/*.dylib ; do
-                       install_name_tool -id "${lib#${DSTROOT}${SDKROOT}}" "${lib}"
-               done
-       fi
-
-       DSTROOT="${DSTROOT}${SDKROOT}"
-fi
 
 function InstallHeaders() {
        DESTDIR="$DSTROOT/$1"
        lookup.subproj/ils.h \
        lookup.subproj/kvbuf.h \
        lookup.subproj/libinfo.h \
+       lookup.subproj/si_compare.h \
        lookup.subproj/si_data.h \
        lookup.subproj/si_module.h \
        lookup.subproj/thread_data.h
 
 InstallHeaders /usr/local/include \
+       lookup.subproj/libinfo_muser.h \
        lookup.subproj/netdb_async.h \
        membership.subproj/membershipPriv.h
 
        nis.subproj/yp_prot.h \
        nis.subproj/ypclnt.h
 
-# Don't install man pages for installhdrs nor simulator builds
-if [ "$ACTION" == "installhdrs" -o \
-     "${RC_ProjectName%_Sim}" != "${RC_ProjectName}" ] ; then
-       exit 0
+# Don't install man pages for installhdrs, installapi, nor simulator builds
+if [[ "${ACTION}" == "installhdrs" ]] || [[ "${ACTION}" == "installapi" ]]; then
+    exit 0
+fi
+
+if [[ "${PLATFORM_NAME}" =~ "simulator" ]]; then
+    exit 0
 fi
 
 function InstallManPages() {