X-Git-Url: https://git.saurik.com/apple/coreosmakefiles.git/blobdiff_plain/75f10a5be1de76af4e664bf5b365a3a64bc60527..51ef2a1e790cc14c89bcf8bf0ec351e89096f437:/ReleaseControl/GNUSource.make diff --git a/ReleaseControl/GNUSource.make b/ReleaseControl/GNUSource.make index a0f312d..2154089 100644 --- a/ReleaseControl/GNUSource.make +++ b/ReleaseControl/GNUSource.make @@ -54,8 +54,6 @@ include $(CoreOSMakefiles)/ReleaseControl/Common.make Sources = $(SRCROOT)/$(Project) ConfigStamp = $(BuildDirectory)/configure-stamp -Workaround_3678855 = /BogusHTMLInstallationDir - ifndef Install_Prefix Install_Prefix = $(USRDIR) endif @@ -67,7 +65,7 @@ Install_Info = $(SHAREDIR)/info endif ifndef Install_HTML ifeq "$(UserType)" "Developer" -Install_HTML = $(Workaround_3678855) +Install_HTML = $(SYSTEM_DEVELOPER_TOOLS_DOC_DIR)/$(ProjectName) else Install_HTML = $(NSDOCUMENTATIONDIR)/$(ToolType)/$(ProjectName) endif @@ -99,6 +97,15 @@ Configure_Flags = --prefix="$(Install_Prefix)" \ --disable-dependency-tracking \ $(Extra_Configure_Flags) +ifndef Configure_Products +Configure_Products = config.h config.log +endif + +# for backwards compatibility; many projects will probably want to override this +Extra_Make_Flags ?= $(Environment) + +Make_Flags = $(Extra_Make_Flags) + Install_Flags = prefix="$(RC_Install_Prefix)" \ mandir="$(RC_Install_Man)" \ infodir="$(RC_Install_Info)" \ @@ -116,9 +123,9 @@ Install_Target = install-strip install:: build ifneq ($(GnuNoInstall),YES) @echo "Installing $(Project)..." - $(_v) umask $(Install_Mask) ; $(MAKE) -C $(BuildDirectory) $(Environment) $(Install_Flags) $(Install_Target) - $(_v) $(FIND) $(DSTROOT) $(Find_Cruft) | $(XARGS) $(RMDIR) - $(_v) $(FIND) $(SYMROOT) $(Find_Cruft) | $(XARGS) $(RMDIR) + $(_v) umask $(Install_Mask) ; $(MAKE) -C $(BuildDirectory) $(Make_Flags) $(Install_Flags) $(Install_Target) + $(_v) $(FIND) $(DSTROOT) $(Find_Cruft) -depth -exec $(RMDIR) "{}" \; + $(_v) $(FIND) $(SYMROOT) $(Find_Cruft) -depth -exec $(RMDIR) "{}" \; ifneq ($(GnuNoChown),YES) $(_v)- $(CHOWN) -R $(Install_User):$(Install_Group) $(DSTROOT) $(SYMROOT) endif @@ -126,16 +133,12 @@ endif ifdef GnuAfterInstall $(_v) $(MAKE) $(GnuAfterInstall) endif - $(_v) if [ -d "$(DSTROOT)$(Workaround_3678855)" ]; then \ - $(INSTALL_DIRECTORY) "$(DSTROOT)$(SYSTEM_DEVELOPER_TOOLS_DOC_DIR)"; \ - $(MV) "$(DSTROOT)$(Workaround_3678855)" \ - "$(DSTROOT)$(SYSTEM_DEVELOPER_TOOLS_DOC_DIR)/$(ProjectName)"; \ - fi + $(_v) $(MAKE) compress_man_pages build:: configure ifneq ($(GnuNoBuild),YES) @echo "Building $(Project)..." - $(_v) $(MAKE) -C $(BuildDirectory) $(Environment) + $(_v) $(MAKE) -C $(BuildDirectory) $(Make_Flags) endif configure:: lazy_install_source $(ConfigStamp) @@ -148,7 +151,11 @@ $(ConfigStamp): ifneq ($(GnuNoConfigure),YES) @echo "Configuring $(Project)..." $(_v) $(MKDIR) $(BuildDirectory) - $(_v) cd $(BuildDirectory) && $(Environment) $(Configure) $(Configure_Flags) +# Disable LD_TRACE_FILE during configure + $(_v) cd $(BuildDirectory) && $(Environment) $(Extra_Configure_Environment) LD_TRACE_FILE=/dev/null $(Configure) $(Configure_Flags) +ifneq ($(Configure_Products),) + $(_v) - $(CP) $(foreach PRODUCT,$(Configure_Products),$(BuildDirectory)/$(PRODUCT)) $(SYMROOT) +endif endif $(_v) touch $@