diff options
author | Ivan Shapovalov | 2017-03-24 21:23:32 +0300 |
---|---|---|
committer | Ivan Shapovalov | 2017-03-24 21:23:32 +0300 |
commit | d34268b7458941336ade673483f1b58f70b1494f (patch) | |
tree | 4f8afd60f00a27747d55273b4eba125720374bf1 /0001-Makefile-DESTDIR-support.patch | |
parent | b61d7ed35602b1f242cd45c91c09809a553596c7 (diff) | |
download | aur-d34268b7458941336ade673483f1b58f70b1494f.tar.gz |
Bump to 20170320; rebase patches.
Diffstat (limited to '0001-Makefile-DESTDIR-support.patch')
-rw-r--r-- | 0001-Makefile-DESTDIR-support.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/0001-Makefile-DESTDIR-support.patch b/0001-Makefile-DESTDIR-support.patch index 5a162b8a6ee6..f7ff7bae7772 100644 --- a/0001-Makefile-DESTDIR-support.patch +++ b/0001-Makefile-DESTDIR-support.patch @@ -1,4 +1,4 @@ -From adf8623ffb74f25ac0fff962946d11b1151fa469 Mon Sep 17 00:00:00 2001 +From 3f3383518ba864092ea67f87295908bc2d96eb07 Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov <intelfx@intelfx.name> Date: Sat, 22 Oct 2016 12:35:14 +0300 Subject: [PATCH 1/5] Makefile: DESTDIR support @@ -8,7 +8,7 @@ Subject: [PATCH 1/5] Makefile: DESTDIR support 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile -index b3bfb11..5918515 100644 +index 5d97412..ae73d56 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ INSTALL=install @@ -20,7 +20,7 @@ index b3bfb11..5918515 100644 # User ID's LPuid=-oroot -@@ -245,8 +245,9 @@ FILES = \ +@@ -248,8 +248,9 @@ FILES = \ # CUPS vars CUPS_SERVERBIN := $(DESTDIR)$(shell cups-config --serverbin 2>/dev/null) @@ -32,7 +32,7 @@ index b3bfb11..5918515 100644 # hpclj2600n-0.icm km2430_0.icm km2430_1.icm km2430_2.icm samclp300-0.icm # sihp1000.img sihp1005.img sihp1020.img sihp1018.img -@@ -654,7 +655,7 @@ install-prog: +@@ -661,7 +662,7 @@ install-prog: $(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/ if [ "$(BINPROGS)" != "" ]; then \ $(INSTALL) -d $(UDEVBIN); \ @@ -41,7 +41,7 @@ index b3bfb11..5918515 100644 fi # # Install gamma correction files. These are just templates, -@@ -708,10 +709,10 @@ install-foo: +@@ -715,10 +716,10 @@ install-foo: # # Clear foomatic cache and rebuild database if needed # @@ -56,7 +56,7 @@ index b3bfb11..5918515 100644 foomatic-combo-xml -O >overview.xml; \ fi -@@ -841,7 +842,7 @@ install-extra: +@@ -848,7 +849,7 @@ install-extra: done MODEL=$(PREFIX)/share/cups/model @@ -65,7 +65,7 @@ index b3bfb11..5918515 100644 MACMODEL=/Library/Printers/PPDs/Contents/Resources PPD=$(PREFIX)/share/ppd VARPPD=/var/lp/ppd -@@ -901,9 +902,9 @@ install-ppd: +@@ -908,9 +909,9 @@ install-ppd: done; \ fi @@ -78,7 +78,7 @@ index b3bfb11..5918515 100644 install-desktop: # -@@ -927,7 +928,7 @@ install-gui: +@@ -934,7 +935,7 @@ install-gui: $(INSTALL) -c -m 755 hplj10xx_gui.tcl $(SHAREZJS) @@ -88,5 +88,5 @@ index b3bfb11..5918515 100644 LIBUDEVDIR=/lib/udev/rules.d RULES=hplj10xx.rules -- -2.10.2 +2.12.1 |