From df6533795b1f9b4cad8dd2773137873355c4b4cc Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 14 Apr 2016 16:04:56 +0100 Subject: [PATCH] Fix installation for no-stdio and no-autoalginit Reviewed-by: Richard Levitte Reviewed-by: Matt Caswell --- Configurations/unix-Makefile.tmpl | 2 ++ tools/build.info | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index e0ad21b683..ed64e654fd 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -86,10 +86,12 @@ DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; } {- output_on() if $disabled{makedepend}; "" -} GENERATED={- join(" ", map { (my $x = $_) =~ s|\.S$|\.s|; $x } keys %{$unified_info{generate}}) -} +{- output_off() if $disabled{apps}; "" -} BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash MISC_SCRIPTS=$(SRCDIR)/tools/c_hash $(SRCDIR)/tools/c_info \ $(SRCDIR)/tools/c_issuer $(SRCDIR)/tools/c_name \ $(BLDDIR)/apps/CA.pl $(BLDDIR)/apps/tsget +{- output_on() if $disabled{apps}; "" -} SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{libraries}}) -} diff --git a/tools/build.info b/tools/build.info index 4010fd4f3a..3810fbcbe0 100644 --- a/tools/build.info +++ b/tools/build.info @@ -1,2 +1,4 @@ -SCRIPTS=c_rehash -SOURCE[c_rehash]=c_rehash.in +IF[{- !$disabled{apps} -}] + SCRIPTS=c_rehash + SOURCE[c_rehash]=c_rehash.in +ENDIF -- 2.34.1