rpms/sane-backends
5
0
Fork 0
Code Issues Pull Requests Releases Activity

make directories before installing into them make "make uninstall" work

Browse Source 
properly
This commit is contained in:
Nils Philippsen 2006-05-17 07:35:27 +00:00
parent c3cf35892e
commit 184035e78a
1 changed files with 132 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

259
sane-backends-1.0.17-pkgconfig.patch
View File

@ -1,5 +1,133 @@
--- sane-backends-1.0.17/tools/sane-config.in.pkgconfig 2006-05-17 08:33:04.000000000 +0200
+++ sane-backends-1.0.17/tools/sane-config.in 2006-05-17 08:33:04.000000000 +0200
@@ -7,30 +7,10 @@
PACKAGE="@PACKAGE@"
scriptname="sane-config"
-LINKER_RPATH=""
prefix="@prefix@"
exec_prefix="@exec_prefix@"
-LIBS="@LIBS@ @DL_LIB@"
-pkgincludedir="@pkgincludedir@"
-pkglibdir="@pkglibdir@"
-includedir="@includedir@"
-mandir="@mandir@"
-infodir="@infodir@"
-libdir="@libdir@"
-localstatedir="@localstatedir@"
-sysconfdir="@sysconfdir@"
-datadir="@datadir@"
-libexecdir="@libexecdir@"
-sbindir="@sbindir@"
-bindir="@bindir@"
-#${prefix}
-#exec_prefix_set=no
-srcdir="@srcdir@"
-top_srcdir="@top_srcdir@"
-cflags=
-
usage ()
{
echo "Usage: " 1>&2
@@ -83,27 +63,13 @@
exit 1
;;
--ldflags)
-
- if test -z "$LINKER_RPATH"; then
- echo "-L${libdir} @GPHOTO2_LDFLAGS@"
- else
- echo "-L${libdir} @GPHOTO2_LDFLAGS@ ${LINKER_RPATH}${libdir}"
- fi
+ pkg-config --libs-only-L sane-backends
;;
--libs)
- echo "-lsane ${LIBS}"
+ pkg-config --libs sane-backends
;;
--cflags)
- unique_cflags=
- if test "${includedir}" != "/usr/include"; then
- unique_cflags="${unique_cflags} -I${includedir}"
- fi
- for i in $cflags; do
- if test "${i}" != "-I${includedir}"; then
- unique_cflags="${unique_cflags} $i"
- fi
- done
- echo ${unique_cflags}
+ pkg-config --cflags sane-backends
;;
--prefix)
echo ${prefix}
--- /dev/null 2006-05-17 07:23:35.099833750 +0200
+++ sane-backends-1.0.17/tools/sane-backends.pc.in 2006-05-17 08:33:04.000000000 +0200
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+pc_libs=@RESMGR_LIBS@ @DL_LIB@ @IEEE1284_LIBS@ @PTHREAD_LIBS@ @JPEG_LIBS@ @PC_LIBS@
+pc_reqs=@PC_REQS@
+
+Name: SANE Backends
+Description: Backends for SANE, the universal scanner interface
+Version: @VERSION@
+Requires: ${pc_reqs}
+Libs: -L${libdir} -lsane ${pc_libs}
+Cflags:
--- sane-backends-1.0.17/tools/Makefile.in.pkgconfig 2005-10-29 16:41:09.000000000 +0200
+++ sane-backends-1.0.17/tools/Makefile.in 2006-05-17 09:29:12.000000000 +0200
@@ -25,6 +25,7 @@
includedir = @includedir@
oldincludedir = /usr/include
configdir = ${sysconfdir}/sane.d
+pkgconfigdir = ${libdir}/pkgconfig
MKDIR = $(top_srcdir)/mkinstalldirs
INSTALL = @INSTALL@
@@ -65,7 +66,8 @@
DISTFILES = Makefile.in RenSaneDlls.cmd README libtool-get-dll-ext \
mustek600iin-off.c sane-config.in sane-desc.c check-usb-chip.c \
- sane-find-scanner.c umax_pp.c xerox gamma4scanimage.c check-po.awk
+ sane-find-scanner.c umax_pp.c xerox gamma4scanimage.c check-po.awk \
+ sane-backends.pc.in
SUBDIRS = hotplug hotplug-ng udev
@@ -79,18 +81,24 @@
all: $(DESTINATIONS)
-install: sane-config sane-find-scanner gamma4scanimage
+install: sane-config sane-backends.pc sane-find-scanner gamma4scanimage
+ $(MKDIR) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgconfigdir)
+ $(INSTALL_DATA) sane-backends.pc $(DESTDIR)$(pkgconfigdir)/sane-backends.pc
$(INSTALL_SCRIPT) sane-config $(DESTDIR)$(bindir)/sane-config
$(INSTALL_PROGRAM) sane-find-scanner $(DESTDIR)$(bindir)/sane-find-scanner
$(INSTALL_PROGRAM) gamma4scanimage $(DESTDIR)$(bindir)/gamma4scanimage
uninstall:
- rm -f $(bindir)/sane-config $(bindir)/sane-find-scanner $(bindir)/gamma4scanimage
+ rm -f $(bindir)/sane-config $(bindir)/sane-find-scanner $(bindir)/gamma4scanimage $(pkgconfigdir)/sane-backends.pc
sane-config: sane-config.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+sane-backends.pc: sane-backends.pc.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
sane-find-scanner: sane-find-scanner.o check-usb-chip.o ../backend/sane_strstatus.lo \
../sanei/sanei_scsi.lo ../sanei/sanei_usb.lo ../sanei/sanei_init_debug.lo \
../sanei/sanei_config.lo
--- sane-backends-1.0.17/ChangeLog.pkgconfig 2005-12-18 15:41:09.000000000 +0100
+++ sane-backends-1.0.17/ChangeLog 2006-05-16 18:31:17.000000000 +0200
+++ sane-backends-1.0.17/ChangeLog 2006-05-17 08:33:04.000000000 +0200
@@ -0,0 +1,7 @@
+2006-05-16 Nils Philippsen <nphilipp@redhat.com>
+
@ -8,8 +136,8 @@
+ re-write sane-config to use pkg-config to avoid multilib problems with
+ conflicting sane-config scripts
+
--- sane-backends-1.0.17/acinclude.m4.pkgconfig 2006-05-16 18:38:02.000000000 +0200
+++ sane-backends-1.0.17/acinclude.m4 2006-05-16 18:31:18.000000000 +0200
--- sane-backends-1.0.17/acinclude.m4.pkgconfig 2006-05-17 09:30:36.000000000 +0200
+++ sane-backends-1.0.17/acinclude.m4 2006-05-17 08:33:05.000000000 +0200
@@ -194,6 +194,7 @@
# Checks for ieee1284 library, needed for canon_pp backend.
AC_DEFUN([SANE_CHECK_IEEE1284],
@ -76,7 +204,7 @@
saved_LIBS="${LIBS}"
LIBS="${LIBS} ${GPHOTO2_LIBS}"
--- sane-backends-1.0.17/configure.in.pkgconfig 2005-12-18 14:15:15.000000000 +0100
+++ sane-backends-1.0.17/configure.in 2006-05-16 18:31:17.000000000 +0200
+++ sane-backends-1.0.17/configure.in 2006-05-17 08:33:04.000000000 +0200
@@ -52,6 +52,7 @@
AC_PROG_MAKE_SET
AC_PROG_CPP
@ -154,126 +282,3 @@
AC_OUTPUT
dnl ***********************************************************************
--- sane-backends-1.0.17/tools/sane-config.in.pkgconfig 2006-05-16 18:31:17.000000000 +0200
+++ sane-backends-1.0.17/tools/sane-config.in 2006-05-16 18:31:17.000000000 +0200
@@ -7,30 +7,10 @@
PACKAGE="@PACKAGE@"
scriptname="sane-config"
-LINKER_RPATH=""
prefix="@prefix@"
exec_prefix="@exec_prefix@"
-LIBS="@LIBS@ @DL_LIB@"
-pkgincludedir="@pkgincludedir@"
-pkglibdir="@pkglibdir@"
-includedir="@includedir@"
-mandir="@mandir@"
-infodir="@infodir@"
-libdir="@libdir@"
-localstatedir="@localstatedir@"
-sysconfdir="@sysconfdir@"
-datadir="@datadir@"
-libexecdir="@libexecdir@"
-sbindir="@sbindir@"
-bindir="@bindir@"
-#${prefix}
-#exec_prefix_set=no
-srcdir="@srcdir@"
-top_srcdir="@top_srcdir@"
-cflags=
-
usage ()
{
echo "Usage: " 1>&2
@@ -83,27 +63,13 @@
exit 1
;;
--ldflags)
-
- if test -z "$LINKER_RPATH"; then
- echo "-L${libdir} @GPHOTO2_LDFLAGS@"
- else
- echo "-L${libdir} @GPHOTO2_LDFLAGS@ ${LINKER_RPATH}${libdir}"
- fi
+ pkg-config --libs-only-L sane-backends
;;
--libs)
- echo "-lsane ${LIBS}"
+ pkg-config --libs sane-backends
;;
--cflags)
- unique_cflags=
- if test "${includedir}" != "/usr/include"; then
- unique_cflags="${unique_cflags} -I${includedir}"
- fi
- for i in $cflags; do
- if test "${i}" != "-I${includedir}"; then
- unique_cflags="${unique_cflags} $i"
- fi
- done
- echo ${unique_cflags}
+ pkg-config --cflags sane-backends
;;
--prefix)
echo ${prefix}
--- /dev/null 2006-05-15 11:22:36.323023750 +0200
+++ sane-backends-1.0.17/tools/sane-backends.pc.in 2006-05-16 18:33:43.000000000 +0200
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+pc_libs=@RESMGR_LIBS@ @DL_LIB@ @IEEE1284_LIBS@ @PTHREAD_LIBS@ @JPEG_LIBS@ @PC_LIBS@
+pc_reqs=@PC_REQS@
+
+Name: SANE Backends
+Description: Backends for SANE, the universal scanner interface
+Version: @VERSION@
+Requires: ${pc_reqs}
+Libs: -L${libdir} -lsane ${pc_libs}
+Cflags:
--- sane-backends-1.0.17/tools/Makefile.in.pkgconfig 2005-10-29 16:41:09.000000000 +0200
+++ sane-backends-1.0.17/tools/Makefile.in 2006-05-16 18:31:17.000000000 +0200
@@ -25,6 +25,7 @@
includedir = @includedir@
oldincludedir = /usr/include
configdir = ${sysconfdir}/sane.d
+pkgconfigdir = ${libdir}/pkgconfig
MKDIR = $(top_srcdir)/mkinstalldirs
INSTALL = @INSTALL@
@@ -65,7 +66,8 @@
DISTFILES = Makefile.in RenSaneDlls.cmd README libtool-get-dll-ext \
mustek600iin-off.c sane-config.in sane-desc.c check-usb-chip.c \
- sane-find-scanner.c umax_pp.c xerox gamma4scanimage.c check-po.awk
+ sane-find-scanner.c umax_pp.c xerox gamma4scanimage.c check-po.awk \
+ sane-backends.pc.in
SUBDIRS = hotplug hotplug-ng udev
@@ -79,8 +81,9 @@
all: $(DESTINATIONS)
-install: sane-config sane-find-scanner gamma4scanimage
+install: sane-config sane-backends.pc sane-find-scanner gamma4scanimage
$(INSTALL_SCRIPT) sane-config $(DESTDIR)$(bindir)/sane-config
+ $(INSTALL_DATA) sane-backends.pc $(DESTDIR)$(pkgconfigdir)/sane-backends.pc
$(INSTALL_PROGRAM) sane-find-scanner $(DESTDIR)$(bindir)/sane-find-scanner
$(INSTALL_PROGRAM) gamma4scanimage $(DESTDIR)$(bindir)/gamma4scanimage
@@ -91,6 +94,10 @@
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+sane-backends.pc: sane-backends.pc.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
sane-find-scanner: sane-find-scanner.o check-usb-chip.o ../backend/sane_strstatus.lo \
../sanei/sanei_scsi.lo ../sanei/sanei_usb.lo ../sanei/sanei_init_debug.lo \
../sanei/sanei_config.lo