net-print/bjfilterpixus560i/files/bjcups-2.4-0_gentoo.patch

bjcups-2.4-0_gentoo.patch (text/x-patch), 3.41 KB, created by tuXXer on 2004-12-30 15:01:45 UTC

diff -ruN bjcups-2.4-0.orig/bjcups/bjcups.c bjcups-2.4-0/bjcups/bjcups.c
--- bjcups-2.4-0.orig/bjcups/bjcups.c	2004-01-20 08:09:33.000000000 +0100
+++ bjcups-2.4-0/bjcups/bjcups.c	2004-12-30 21:49:25.000000000 +0100
@@ -43,7 +43,7 @@
 
 #define	BJ_SOCKET		"/tmp/bjui"
 
-#define	UI_PATH			"/usr/local/bin/"
+#define	UI_PATH			"/usr/bin/"
 #define	UI_NAME			"printui"
 
 #define	UI_OPT_VERSION	1
diff -ruN bjcups-2.4-0.orig/bjcups/Makefile bjcups-2.4-0/bjcups/Makefile
--- bjcups-2.4-0.orig/bjcups/Makefile	2003-10-20 11:07:43.000000000 +0200
+++ bjcups-2.4-0/bjcups/Makefile	2004-12-30 21:49:25.000000000 +0100
@@ -1,6 +1,6 @@
-INSTALL_DIR = /usr/local/bin
+INSTALL_DIR = %%D%%/usr/bin
 INSTALL_BIN = /usr/bin/install -c
-HDRPATH = -I ../include/cncl -I ../include/misc
+HDRPATH = -I ../include/cncl -I ../include/misc -I ../libs/bjexec -I ../libs/paramlist
 
 TARGET = bjcups
 
@@ -8,7 +8,7 @@
 LFLAGS =
 
 OBJS = bjcups.o getipc.o bjutil.o
-LIBS = -lpopt -lcups -lparamlist
+LIBS = -L ../libs/bjexec -L ../libs/paramlist -lpopt -lcups -lparamlist
 
 .c.o : 
 	$(CC) $(CFLAGS) $(HDRPATH) $<
diff -ruN bjcups-2.4-0.orig/filter/Makefile bjcups-2.4-0/filter/Makefile
--- bjcups-2.4-0.orig/filter/Makefile	2003-10-20 11:07:11.000000000 +0200
+++ bjcups-2.4-0/filter/Makefile	2004-12-30 21:49:25.000000000 +0100
@@ -1,6 +1,6 @@
-INSTALL_DIR = /usr/lib/cups/filter
+INSTALL_DIR = %%D%%/usr/lib/cups/filter
 INSTALL_BIN = /usr/bin/install -c
-HDRPATH =
+HDRPATH = -I ../libs/bjexec -I ../libs/paramlist
 
 TARGET = pstocanonbj
 
@@ -8,7 +8,7 @@
 LFLAGS =
 
 OBJS = pstocanonbj.o canonopt.o
-LIBS = -lcups -lbjexec -lparamlist
+LIBS = -L ../libs/bjexec -L ../libs/paramlist -lcups -lbjexec -lparamlist
 
 .c.o : 
 	$(CC) $(CFLAGS) $(HDRPATH) $<
diff -ruN bjcups-2.4-0.orig/libs/bjexec/bjexec.c bjcups-2.4-0/libs/bjexec/bjexec.c
--- bjcups-2.4-0.orig/libs/bjexec/bjexec.c	2003-11-26 06:22:44.000000000 +0100
+++ bjcups-2.4-0/libs/bjexec/bjexec.c	2004-12-30 21:49:25.000000000 +0100
@@ -31,7 +31,7 @@
 #include "bjexec.h"
 
 
-#define FILTER_PATH		"/usr/local/bin/"
+#define FILTER_PATH		"/usr/bin/"
 #define FILTER_EXEC		"bjfilter"
 
 
diff -ruN bjcups-2.4-0.orig/libs/bjexec/Makefile bjcups-2.4-0/libs/bjexec/Makefile
--- bjcups-2.4-0.orig/libs/bjexec/Makefile	2003-10-01 04:19:51.000000000 +0200
+++ bjcups-2.4-0/libs/bjexec/Makefile	2004-12-30 21:49:25.000000000 +0100
@@ -1,5 +1,5 @@
-INSTALL_DIR = /usr/lib
-INSTALL_HDR = /usr/include
+INSTALL_DIR = %%D%%/usr/lib
+INSTALL_HDR = %%D%%/usr/include
 INSTALL_LIB = /usr/bin/install -c -m 644
 INSTALL_DAT = /usr/bin/install -c -m 644
 
diff -ruN bjcups-2.4-0.orig/libs/paramlist/Makefile bjcups-2.4-0/libs/paramlist/Makefile
--- bjcups-2.4-0.orig/libs/paramlist/Makefile	2003-09-29 03:44:49.000000000 +0200
+++ bjcups-2.4-0/libs/paramlist/Makefile	2004-12-30 21:49:25.000000000 +0100
@@ -1,5 +1,5 @@
-INSTALL_DIR = /usr/lib
-INSTALL_HDR = /usr/include
+INSTALL_DIR = %%D%%/usr/lib
+INSTALL_HDR = %%D%%/usr/include
 INSTALL_LIB = /usr/bin/install -c -m 644
 INSTALL_DAT = /usr/bin/install -c -m 644
 
diff -ruN bjcups-2.4-0.orig/ppd/Makefile bjcups-2.4-0/ppd/Makefile
--- bjcups-2.4-0.orig/ppd/Makefile	2003-11-26 06:26:30.000000000 +0100
+++ bjcups-2.4-0/ppd/Makefile	2004-12-30 23:21:00.051589832 +0100
@@ -1,7 +1,7 @@
-INSTALL_DIR = /usr/share/cups/model
+INSTALL_DIR = %%D%%/usr/share/cups/model
 INSTALL_DAT = /usr/bin/install -c -m 644
 
-FILES = canonpixus560i.ppd canonpixus860i.ppd canonpixus990i.ppd
+FILES = canonpixus560i.ppd
 
 all :