mdw@git.distorted.org.uk Git - termux-packages/blob - packages/stfl/001-makefile.patch

   1 diff -Naur stfl-0.24.orig/Makefile stfl-0.24/Makefile
   2 --- stfl-0.24.orig/Makefile     2015-02-12 14:14:33.000000000 +0100
   3 +++ stfl-0.24/Makefile  2016-05-31 21:26:11.162048447 +0200
   4 @@ -20,10 +20,6 @@
   5
   6  include Makefile.cfg
   7
   8 -export CC = gcc -pthread
   9 -export CFLAGS += -I. -Wall -Os -ggdb -D_GNU_SOURCE -fPIC
  10 -export LDLIBS += -lncursesw
  11 -
  12  SONAME  := libstfl.so.0
  13  VERSION := 0.24
  14
  15 @@ -34,12 +30,12 @@
  16  libstfl.a: public.o base.o parser.o dump.o style.o binding.o iconv.o \
  17             $(patsubst %.c,%.o,$(wildcard widgets/*.c))
  18         rm -f $@
  19 -       ar qc $@ $^
  20 -       ranlib $@
  21 +       $(AR) qc $@ $^
  22 +       $(RANLIB) $@
  23
  24  libstfl.so.$(VERSION): public.o base.o parser.o dump.o style.o binding.o iconv.o \
  25                         $(patsubst %.c,%.o,$(wildcard widgets/*.c))
  26 -       $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $(LDLIBS) $^
  27 +       $(CC) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $(LDLIBS) $^
  28
  29  clean:
  30         rm -f libstfl.a example core core.* *.o Makefile.deps
  31 @@ -65,6 +61,7 @@
  32         install -m 644 stfl.pc $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/
  33         install -m 644 libstfl.so.$(VERSION) $(DESTDIR)$(prefix)/$(libdir)
  34         ln -fs libstfl.so.$(VERSION) $(DESTDIR)$(prefix)/$(libdir)/libstfl.so
  35 +       ln -fs libstfl.so.$(VERSION) $(DESTDIR)$(prefix)/$(libdir)/libstfl.so.0
  36
  37  stfl.pc: stfl.pc.in
  38         sed 's,@VERSION@,$(VERSION),g' < $< | sed 's,@PREFIX@,$(prefix),g' > $@
  39 diff -Naur stfl-0.24.orig/Makefile.cfg stfl-0.24/Makefile.cfg
  40 --- stfl-0.24.orig/Makefile.cfg 2009-05-31 20:20:39.000000000 +0200
  41 +++ stfl-0.24/Makefile.cfg      2016-05-30 05:50:59.051375377 +0200
  42 @@ -20,7 +20,6 @@
  43
  44  export libdir ?= lib
  45  export prefix ?= /usr/local
  46 -export DESTDIR ?= /
  47
  48  ifneq ($(shell spl-config --cflags 2>/dev/null),)
  49  FOUND_SPL = 1