Skip to content

Commit 80cd993

Browse files
committed
scripted-diff: Rename INSTALLNAMETOOL -> INSTALL_NAME_TOOL
This change makes naming of `install_name_tool` consistent across the whole build system. -BEGIN VERIFY SCRIPT- sed --in-place --expression='s/INSTALLNAMETOOL/INSTALL_NAME_TOOL/g' $(git grep --files-with-matches 'INSTALLNAMETOOL') -END VERIFY SCRIPT-
1 parent a4fd440 commit 80cd993

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ $(OSX_DMG): deploydir
133133
$(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ $(APP_DIST_DIR) -- $(if $(SOURCE_DATE_EPOCH),-volume_date all_file_dates =$(SOURCE_DATE_EPOCH))
134134

135135
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
136-
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR)
136+
INSTALL_NAME_TOOL=$(INSTALL_NAME_TOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR)
137137

138138
deploydir: $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
139139
endif !BUILD_DARWIN

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ case $host in
775775
;;
776776
*)
777777
AC_PATH_TOOL([DSYMUTIL], [dsymutil], [dsymutil])
778-
AC_PATH_TOOL([INSTALLNAMETOOL], [install_name_tool], [install_name_tool])
778+
AC_PATH_TOOL([INSTALL_NAME_TOOL], [install_name_tool], [install_name_tool])
779779
AC_PATH_TOOL([OTOOL], [otool], [otool])
780780
AC_PATH_PROGS([XORRISOFS], [xorrisofs], [xorrisofs])
781781

contrib/macdeploy/macdeployqtplus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ def getFrameworks(binaryPath: str, verbose: int) -> List[FrameworkInfo]:
211211
return libraries
212212

213213
def runInstallNameTool(action: str, *args):
214-
installnametoolbin=os.getenv("INSTALLNAMETOOL", "install_name_tool")
214+
installnametoolbin=os.getenv("INSTALL_NAME_TOOL", "install_name_tool")
215215
run([installnametoolbin, "-"+action] + list(args), check=True)
216216

217217
def changeInstallName(oldName: str, newName: str, binaryPath: str, verbose: int):

0 commit comments

Comments
 (0)