From 56678181e5a8469e661e08e54fdda09bfd8f0d3702bf348d716fa2e09d04242d Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Mon, 4 Jul 2022 18:04:35 +0000
Subject: [PATCH] Accepting request 986711 from home:mcepl:branches:Base:System

Fix calling of `make`.

OBS-URL: https://build.opensuse.org/request/show/986711
OBS-URL: https://build.opensuse.org/package/show/Base:System/par_text?expand=0&rev=8
---
 par-1.53-i18n.1.patch | 23 ++++++++++++++++++-----
 par_text.spec         |  2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/par-1.53-i18n.1.patch b/par-1.53-i18n.1.patch
index 53fcbeb..92f53cd 100644
--- a/par-1.53-i18n.1.patch
+++ b/par-1.53-i18n.1.patch
@@ -6,11 +6,11 @@
  errmsg.c      |   12 +
  errmsg.h      |   12 +
  par.c         |  444 ++++++++++++++++++++++++++++++----------------------------
- protoMakefile |    2 
+ protoMakefile |    8 -
  reformat.c    |  168 +++++++++++++--------
  reformat.h    |    6 
  releasenotes  |   16 ++
- 11 files changed, 419 insertions(+), 324 deletions(-)
+ 12 files changed, 423 insertions(+), 328 deletions(-)
 
 --- a/buffer.c
 +++ b/buffer.c
@@ -1244,15 +1244,28 @@
    return *errmsg ? EXIT_FAILURE : EXIT_SUCCESS;
 --- a/protoMakefile
 +++ b/protoMakefile
-@@ -47,7 +47,7 @@
+@@ -45,9 +45,9 @@
+ # Example (for Solaris 2.x with SPARCompiler C):
+ # CC = cc -c -O -s -Xc -DDONTFREE
  
- CPPFLAGS =
- CFLAGS =
+-CPPFLAGS =
+-CFLAGS =
 -CC = cc $(CPPFLAGS) $(CFLAGS) -c
++CPPFLAGS ?=
++CFLAGS ?=
 +CC = cc -std=c99 $(CPPFLAGS) $(CFLAGS) -c
  
  # Define LINK1 and LINK2 so that the command
  #
+@@ -62,7 +62,7 @@ CC = cc $(CPPFLAGS) $(CFLAGS) -c
+ # LINK2 = -o
+ 
+ LINK1 = cc
+-LINK2 = -o
++LINK2 = $(CFLAGS) $(CPPFLAGS) -o
+ 
+ # Define RM so that the command
+ #
 --- a/reformat.c
 +++ b/reformat.c
 @@ -3,6 +3,7 @@ reformat.c
diff --git a/par_text.spec b/par_text.spec
index 6333012..696bae7 100644
--- a/par_text.spec
+++ b/par_text.spec
@@ -57,7 +57,7 @@ end in the same column.
 %autosetup -p1 -n %{upname}-%{version}
 
 %build
-make -f protoMakefile CC="cc -c" LINK1="cc" LINK2="-o" RM="rm" JUNK="" %{?_smp_mflags} CFLAGS="%{optflags}"$*
+make -f protoMakefile %{?_smp_mflags} CFLAGS="%{optflags}" $*
 
 %install
 install -D -t %{buildroot}/%{_bindir} par