Update Haiku Makefile

diff --git a/misc/haiku/Makefile b/misc/haiku/Makefile
index 1568855771477ebb67aac25a06bce25f51178d17..192ff6dc7b878c12a78f6bc253c4fa01f303c5bc 100644 (file)
--- a/misc/haiku/Makefile
+++ b/misc/haiku/Makefile
@@ -33,10 +33,17 @@ endif
 
 ifeq ($(O_NORL),1)
        CPPFLAGS += -DNORL
+else ifeq ($(O_STATIC),1)
+       CPPFLAGS += -DNORL
 else
        LDLIBS += -lreadline
 endif
 
+ifeq ($(O_PCRE),1)
+       CPPFLAGS += -DPCRE
+       LDLIBS += -lpcre
+endif
+
 ifeq ($(O_NOLOC),1)
        CPPFLAGS += -DNOLOCALE
 endif
@@ -63,6 +70,12 @@ CFLAGS += $(CFLAGS_CURSES)
 
 LDLIBS += $(LDLIBS_CURSES) $(LDLIBS_HAIKU)
 
+# static compilation needs libgpm development package
+ifeq ($(O_STATIC),1)
+       LDFLAGS += -static
+       LDLIBS += -lgpm
+endif
+
 DISTFILES = src nnn.1 Makefile README.md LICENSE
 SRC = src/nnn.c
 HEADERS = src/nnn.h
@@ -122,12 +135,14 @@ upload-local: sign static
        curl -XPOST 'https://uploads.github.com/repos/jarun/nnn/releases/$(ID)/assets?name=nnn-$(VERSION).tar.gz.sig' \
            -H 'Authorization: token $(NNN_SIG_UPLOAD_TOKEN)' -H 'Content-Type: application/pgp-signature' \
            --upload-file nnn-$(VERSION).tar.gz.sig
-       curl -XPOST 'https://uploads.github.com/repos/jarun/nnn/releases/$(ID)/assets?name=nnn-$(VERSION)-static' \
+       tar -cf $(BIN)-static-$(VERSION).x86-64.tar.gz $(BIN)-static
+       curl -XPOST 'https://uploads.github.com/repos/jarun/nnn/releases/$(ID)/assets?name=nnn-$(VERSION)-static-$(VERSION).x86-64.tar.gz' \
            -H 'Authorization: token $(NNN_SIG_UPLOAD_TOKEN)' -H 'Content-Type: application/x-sharedlib' \
-           --upload-file $(BIN)-static
+           --upload-file $(BIN)-static-$(VERSION).x86-64.tar.gz
 
 clean:
-       $(RM) -f $(BIN) $(BIN)-static $(OBJS) nnn-$(VERSION).tar.gz *.sig
+       $(RM) -f $(BIN) nnn-$(VERSION).tar.gz *.sig \
+           $(BIN)-static $(BIN)-static-$(VERSION).x86-64.tar.gz
 
 skip: ;