up to 3.6

[packages/nnn.git] / nnn-flags.patch

diff --git a/nnn-flags.patch b/nnn-flags.patch
index 2305f2b6fe43d254e50e576fc00eccd62e9b5032..1d75cc307c646d0dcc171bc0ebb902bdc08dd036 100644 (file)
--- a/nnn-flags.patch
+++ b/nnn-flags.patch
@@ -3,7 +3,7 @@
 @@ -41,7 +41,7 @@
  endif
  
- ifeq ($(O_PCRE),1)
+ ifeq ($(strip $(O_PCRE)),1)
 -      CPPFLAGS += -DPCRE
 +      override CPPFLAGS += -DPCRE
        LDLIBS += -lpcre
@@ -12,12 +12,12 @@
 @@ -62,7 +62,7 @@
  endif
  
- ifeq ($(O_CTX8),1)
+ ifeq ($(strip $(O_CTX8)),1)
 -      CPPFLAGS += -DCTX8
 +      override CPPFLAGS += -DCTX8
  endif
  
- ifeq ($(shell $(PKG_CONFIG) ncursesw && echo 1),1)
+ ifeq ($(strip $(O_ICONS)),1)
 @@ -75,9 +75,9 @@
        LDLIBS_CURSES ?= -lncurses
  endif