From 7bae604711534708f9678334b71b9a5f746db452 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Fri, 8 Jan 2016 09:53:44 -0700
Subject: [PATCH] fix default source catalog for `make`

---
 Makefile                   | 2 +-
 racket/src/pkgs-config.rkt | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 550ec36e1d..eaa9894469 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ WIN32_RUN_RACKET = $(WIN32_PLAIN_RACKET) -G racket/etc -X racket/collects
 RUN_RACO = $(RUN_RACKET) -N raco -l- raco
 WIN32_RUN_RACO = $(WIN32_RUN_RACKET) -N raco -l- raco
 
-DEFAULT_SRC_CATALOG = http://pkgs.racket-lang.org
+DEFAULT_SRC_CATALOG = https://pkgs.racket-lang.org
 
 CPUS = 
 
diff --git a/racket/src/pkgs-config.rkt b/racket/src/pkgs-config.rkt
index d7401fa91b..84549ee756 100644
--- a/racket/src/pkgs-config.rkt
+++ b/racket/src/pkgs-config.rkt
@@ -34,8 +34,9 @@
             ((length l) . >= . 1)
             (equal? (car l) catalog-relative-path-str)))
      (define has-src-catalog?
-       (member (if src-catalog-is-default? #f src-catalog)
-               l))
+       (or (and src-catalog-is-default?
+                (member #f l))
+           (member src-catalog l)))
      (unless (and starts-as-expected?
                   has-src-catalog?)
        (error 'pkgs-catalog