From 348e5c405ac8d765d2300ca044c098b2ef15cb94 Mon Sep 17 00:00:00 2001 From: Thomas BERNARD Date: Sat, 3 Feb 2018 18:29:35 +0100 Subject: [PATCH] Fix Makefile for GNU make 3.80 "else ifeq" on the same line is not compatible with GNU Make 3.80 --- minissdpd/Makefile | 4 +++- miniupnpc/Makefile | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/minissdpd/Makefile b/minissdpd/Makefile index 18c0e2a..db202ee 100644 --- a/minissdpd/Makefile +++ b/minissdpd/Makefile @@ -28,12 +28,14 @@ ifneq (, $(findstring linux, $(OS))) endif ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) LDLIBS += -lfreebsd-glue -else ifneq (, $(findstring sun, $(OS))) +else +ifneq (, $(findstring sun, $(OS))) CFLAGS += -D_XOPEN_SOURCE CFLAGS += -D_XOPEN_SOURCE_EXTENDED=1 CFLAGS += -D__EXTENSIONS__ LDFLAGS += -lsocket -lnsl -lresolv endif +endif #EXECUTABLES = minissdpd testminissdpd listifaces EXECUTABLES = minissdpd testminissdpd testcodelength \ diff --git a/miniupnpc/Makefile b/miniupnpc/Makefile index de1d65b..f4dd8f1 100644 --- a/miniupnpc/Makefile +++ b/miniupnpc/Makefile @@ -16,9 +16,11 @@ VERSION = $(shell cat VERSION) ifneq (, $(findstring darwin, $(OS))) JARSUFFIX=mac LIBTOOL ?= $(shell which libtool) -else ifneq (, $(findstring linux, $(OS))) +endif +ifneq (, $(findstring linux, $(OS))) JARSUFFIX=linux -else ifneq (, $(findstring mingw, $(OS))$(findstring cygwin, $(OS))$(findstring msys, $(OS))) +endif +ifneq (, $(findstring mingw, $(OS))$(findstring cygwin, $(OS))$(findstring msys, $(OS))) JARSUFFIX=win32 endif @@ -104,13 +106,15 @@ ifneq (, $(findstring darwin, $(OS))) SHAREDLIBRARY = libminiupnpc.dylib SONAME = $(basename $(SHAREDLIBRARY)).$(APIVERSION).dylib CFLAGS := -D_DARWIN_C_SOURCE $(CFLAGS) -else ifeq ($(JARSUFFIX), win32) +else +ifeq ($(JARSUFFIX), win32) SHAREDLIBRARY = miniupnpc.dll else # Linux/BSD/etc. SHAREDLIBRARY = libminiupnpc.so SONAME = $(SHAREDLIBRARY).$(APIVERSION) endif +endif EXECUTABLES = upnpc-static listdevices EXECUTABLES_ADDTESTS = testminixml minixmlvalid testupnpreplyparse \