summarylogtreecommitdiffstats
path: root/0004-Makefile-fix-generating-.ppd-in-place.patch
diff options
context:
space:
mode:
authorIvan Shapovalov2018-06-03 02:08:03 +0300
committerIvan Shapovalov2018-06-03 02:08:17 +0300
commit21896c6bd0cf96fddf94b4f0e1b349a6ab8eeadc (patch)
tree673610e48bf5c1537a55cab38b63362fd1d1bb38 /0004-Makefile-fix-generating-.ppd-in-place.patch
parent613c2f841f4ec778bba0c3363a3278ec62ff26e8 (diff)
downloadaur-21896c6bd0cf96fddf94b4f0e1b349a6ab8eeadc.tar.gz
Bump; fix nightly source checksum; rebase patches; fix a race in Makefile
Diffstat (limited to '0004-Makefile-fix-generating-.ppd-in-place.patch')
-rw-r--r--0004-Makefile-fix-generating-.ppd-in-place.patch25
1 files changed, 10 insertions, 15 deletions
diff --git a/0004-Makefile-fix-generating-.ppd-in-place.patch b/0004-Makefile-fix-generating-.ppd-in-place.patch
index b506928090e9..d8e5ef8d7f22 100644
--- a/0004-Makefile-fix-generating-.ppd-in-place.patch
+++ b/0004-Makefile-fix-generating-.ppd-in-place.patch
@@ -1,29 +1,24 @@
-From 01eb8e0e1fd6447d7931f33718da760f050fdb34 Mon Sep 17 00:00:00 2001
+From bb8cb495855b1d4fc9ba0037f6298d35ccda6cc1 Mon Sep 17 00:00:00 2001
From: Ivan Shapovalov <intelfx@intelfx.name>
Date: Sun, 23 Oct 2016 01:01:17 +0300
-Subject: [PATCH 4/6] Makefile: fix generating *.ppd in-place
+Subject: [PATCH 4/7] Makefile: fix generating *.ppd in-place
---
- Makefile | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
-index 429b842..6282bda 100644
+index bac37c4..0365139 100644
--- a/Makefile
+++ b/Makefile
-@@ -1452,10 +1452,8 @@ ppd:
+@@ -1454,6 +1454,7 @@ ppd:
*) driver=foo2zjs;; \
esac; \
echo $$driver - $$printer; \
-- ENGINE=../foomatic/foomatic-db-engine; \
-- PERL5LIB=$$ENGINE/lib \
-- FOOMATICDB=foomatic-db \
-- $$ENGINE/foomatic-ppdfile \
+ FOOMATICDB=foomatic-db \
-+ foomatic-ppdfile \
- -d $$driver -p $$printer \
- > PPD/$$printer.ppd; \
- done
+ foomatic-ppdfile -d $$driver -p $$printer > PPD/$$printer.ppd; \
+ #ENGINE=../foomatic/foomatic-db-engine; \
+ #PERL5LIB=$$ENGINE/lib \
--
-2.15.1
+2.17.1