From 6a367fa97be55a63fd806a642499b24707757c71 Mon Sep 17 00:00:00 2001 From: Kristofer Hallin Date: Wed, 17 Aug 2022 09:39:16 +0200 Subject: [PATCH] Two minor fixes for building on macOS, HOST_VENDOR should be defined before trying to check its value. --- apps/backend/Makefile.in | 12 ++++++------ apps/cli/Makefile.in | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/backend/Makefile.in b/apps/backend/Makefile.in index cd96971c..9bfa8d92 100644 --- a/apps/backend/Makefile.in +++ b/apps/backend/Makefile.in @@ -46,12 +46,6 @@ endif SH_SUFFIX = @SH_SUFFIX@ LIBSTATIC_SUFFIX = @LIBSTATIC_SUFFIX@ -ifeq ($(HOST_VENDOR),apple) -INSTALLFLAGS = -else -INSTALLFLAGS = @INSTALLFLAGS@ -endif - LDFLAGS = @LDFLAGS@ ifneq ($(LINKAGE),dynamic) LDFLAGS += -rdynamic -L. @@ -70,6 +64,12 @@ HOST_VENDOR = @host_vendor@ CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@ CLIXON_MINOR = @CLIXON_VERSION_MINOR@ +ifeq ($(HOST_VENDOR),apple) +INSTALLFLAGS = +else +INSTALLFLAGS = @INSTALLFLAGS@ +endif + # Use this clixon lib for linking ifeq ($(LINKAGE),dynamic) CLIXON_LIB = libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR) diff --git a/apps/cli/Makefile.in b/apps/cli/Makefile.in index d67d789d..9d073507 100644 --- a/apps/cli/Makefile.in +++ b/apps/cli/Makefile.in @@ -50,12 +50,6 @@ endif SH_SUFFIX = @SH_SUFFIX@ LIBSTATIC_SUFFIX = @LIBSTATIC_SUFFIX@ -ifeq ($(HOST_VENDOR),apple) -INSTALLFLAGS = -else -INSTALLFLAGS = @INSTALLFLAGS@ -endif - LDFLAGS = @LDFLAGS@ ifneq ($(LINKAGE),dynamic) # -rdynamic for using -ldl @@ -77,6 +71,12 @@ HOST_VENDOR = @host_vendor@ CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@ CLIXON_MINOR = @CLIXON_VERSION_MINOR@ +ifeq ($(HOST_VENDOR),apple) +INSTALLFLAGS = +else +INSTALLFLAGS = @INSTALLFLAGS@ +endif + # Use this clixon lib for linking ifeq ($(LINKAGE),dynamic) CLIXON_LIB = libclixon$(SH_SUFFIX).$(CLIXON_MAJOR).$(CLIXON_MINOR)