From: Alan T. DeKok Date: Wed, 15 Feb 2017 15:57:33 +0000 (-0500) Subject: make the install process a little clearer X-Git-Tag: release_3_0_13~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d83575b3d0352cd29338a6994edf42a2b06ee457;p=thirdparty%2Ffreeradius-server.git make the install process a little clearer --- diff --git a/raddb/all.mk b/raddb/all.mk index b087dc16852..370f5337a2e 100644 --- a/raddb/all.mk +++ b/raddb/all.mk @@ -18,8 +18,16 @@ LOCAL_MODULES := $(addprefix raddb/mods-enabled/,$(DEFAULT_MODULES)) LOCAL_CERT_FILES := Makefile README xpextensions \ ca.cnf server.cnf client.cnf bootstrap +# +# We don't create the installed certs if we're building a package, +# OR if OpenSSL is not available. +# +ifeq "$(PACKAGE)" "" +ifneq "$(OPENSSL_LIBS)" "" LOCAL_CERT_PRODUCTS := $(addprefix $(R)$(raddbdir)/certs/,ca.key ca.pem \ client.key client.pem server.key server.pem) +endif +endif LEGACY_LINKS := $(addprefix $(R)$(raddbdir)/,users huntgroups hints) @@ -112,7 +120,7 @@ $(R)$(raddbdir)/users: $(R)$(modconfdir)/files/authorize @[ -e $@ ] || echo LN-S $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) @[ -e $@ ] || ln -s $(patsubst $(R)$(raddbdir)/%,./%,$<) $@ -ifeq ("$(PACKAGE)","") +ifneq "$(LOCAL_CERT_PRODUCTS)" "" $(LOCAL_CERT_PRODUCTS): @echo BOOTSTRAP raddb/certs/ @$(MAKE) -C $(R)$(raddbdir)/certs/