Drop need of setting TERMUX_PKG_FOLDERNAME

[termux-packages] / packages / unrar / makefile.patch

diff --git a/packages/unrar/makefile.patch b/packages/unrar/makefile.patch
index b4fbe8e..06860e0 100644 (file)
--- a/packages/unrar/makefile.patch
+++ b/packages/unrar/makefile.patch
@@ -1,28 +1,26 @@
-diff -u -r ../unrar/makefile ./makefile
---- ../unrar/makefile  2013-04-29 16:27:05.000000000 +0200
-+++ ./makefile 2014-02-13 00:29:04.000000000 +0100
-@@ -2,13 +2,9 @@
+diff -uNr unrar/makefile unrar.mod/makefile
+--- unrar/makefile     2017-06-13 14:04:49.000000000 +0300
++++ unrar.mod/makefile 2017-09-14 20:40:07.511902817 +0300
+@@ -2,14 +2,15 @@
  # Makefile for UNIX - unrar
  
  # Linux using GCC
--CXX=g++
+-CXX=c++
 -CXXFLAGS=-O2
 -LIBFLAGS=-fPIC
++CXX?=c++
++CXXFLAGS?=-O2
 +LIBFLAGS=$(LDFLAGS)
  DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
 -STRIP=strip
+-AR=ar
 -LDFLAGS=-pthread
 -DESTDIR=/usr
-+DESTDIR=@TERMUX_PREFIX@
++STRIP?=strip
++AR?=ar
++LDFLAGS?=-pthread
++DESTDIR=$(PREFIX)
++LIBS=-lreadline
  
  # Linux using LCC
  #CXX=lcc
-@@ -136,7 +132,7 @@
-       $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
- 
- install-unrar:
--                      install -D unrar $(DESTDIR)/bin/unrar
-+                      install unrar $(DESTDIR)/bin/unrar
- 
- uninstall-unrar:
-                       rm -f $(DESTDIR)/bin/unrar