From c7d95c0ef319a585abd988c7114fc5c4492e45c4 Mon Sep 17 00:00:00 2001
From: Saul Gutierrez <sggutier@fb.com>
Date: Fri, 4 Nov 2022 16:41:43 -0700
Subject: [PATCH] build: fix binary name produced on `make oss` (#60)

Summary:
When running `make oss` or `make install-oss`, both a `hg` and a `sl` binaries would be produced under `eden/scm/build/scripts-*/`. For `make oss` a `hg` binary was produced at `eden/scm` and when running make install, `hg` and `sl` binaries were created under `$DESTDIR/usr/local/bin/`.

This diff fixes both of the previously mentioned behaviors so that now only a `sl` binary is created at `eden/scm`,  `eden/scm/build/scripts-*/`, and `$DESTDIR/usr/local/bin/`.

X-link: https://github.com/facebook/sapling-staging/pull/60

Reviewed By: bolinfest

Differential Revision: D41047258

Pulled By: sggutier

fbshipit-source-id: 4fde9c659be4e69105105922a2711575ac4073eb
---
 eden/scm/.gitignore | 3 ++-
 eden/scm/Makefile   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/eden/scm/.gitignore b/eden/scm/.gitignore
index 6b560ef4fb..efda8abfbb 100644
--- a/eden/scm/.gitignore
+++ b/eden/scm/.gitignore
@@ -87,9 +87,10 @@ wheelhouse/
 hg-python
 hg.py
 
-# mercurial binary
+# scm binary
 hg
 hg3
+sl
 
 # make-local Windows artifacts
 hgrc.d
diff --git a/eden/scm/Makefile b/eden/scm/Makefile
index 101798c1cc..1edeb5874b 100644
--- a/eden/scm/Makefile
+++ b/eden/scm/Makefile
@@ -67,8 +67,8 @@ help:
 all: build
 
 oss:
-	export HGNAME=sl
-	SAPLING_OSS_BUILD=true \
+	$(eval HGNAME = sl)
+	SAPLING_OSS_BUILD=true HGNAME=$(HGNAME) \
 	  $(shell $(PYTHON3) contrib/pick_python.py $(PYTHON3)) setup_with_version.py $(PURE) \
 	  build_interactive_smartlog \
 	  build_py -c -d . \