]> git.pld-linux.org Git - packages/gfax.git/blame - gfax-paths.patch
- drop obsolete and outdated manual inclusion of rpm macros
[packages/gfax.git] / gfax-paths.patch
CommitLineData
b3d49350
JB
1--- gfax/configure.in.orig 2005-02-22 22:22:43.000000000 +0100
2+++ gfax/configure.in 2005-05-03 02:17:10.000000000 +0200
3@@ -41,6 +41,20 @@
4 AC_MSG_ERROR([Can't find "mcs" in your PATH])
5 fi
6
7+PKG_CHECK_MODULES(MONO_DEPENDENCY, mono, have_mono=true, have_mono=false)
8+PKG_CHECK_MODULES(MONO_DEPENDENCY, mint, have_mint=true, have_mint=false)
9+
10+if test "$have_mono" = "true"; then
11+ mono=mono
12+else
13+ if test "$have_mint" = "true"; then
14+ mono=mint
15+ else
16+ AC_MSG_ERROR([Can't find either mono or mint])
17+ fi
18+fi
19+AC_SUBST(mono)
20+
21 #
22 # Use DBus# to export our remote control if available.
23 #
c9478ee1
JB
24@@ -68,8 +68,8 @@
25
26 # SET THE DIRECTORY PATH FOR GNOME_PRINT_DATA_DIR
27 if test "x$GNOME_PRINT_DATA_DIR" = "x" ; then
28- gpver=`ls ${prefix}/lib/pkgconfig/ | grep libgnomeprint`
29- GNOME_PRINT_VERSION=`grep Version: ${prefix}/lib/pkgconfig/${gpver} | cut -f2 -d' '`
30+ gpver=`ls ${libdir}/pkgconfig/ | grep libgnomeprint-`
31+ GNOME_PRINT_VERSION=`grep Version: ${libdir}/pkgconfig/${gpver} | cut -f2 -d' '`
32 GNOME_PRINT_DATA_DIR="${datadir}/libgnomeprint/${GNOME_PRINT_VERSION}"
33 echo $GNOME_PRINT_DATA_DIR
34 fi
b3d49350
JB
35--- gfax/gfax.in.orig 2005-02-01 00:03:09.000000000 +0100
36+++ gfax/gfax.in 2005-05-03 02:13:33.000000000 +0200
37@@ -22,11 +22,11 @@
38 fi
39
40 if [ $STD = "yes" ]; then
41- exec mono @prefix@/lib/gfax/gfax.exe -f $SPOOL_DIR/D.$RNAME &
42+ exec @mono@ @pkglibdir@/gfax.exe -f $SPOOL_DIR/D.$RNAME &
43 #rm -f $SPOOL_DIR/D.$RNAME
44 exit 0
45 fi
46
47 # If it's not a fax piped in on stdin, pass everything straight through to
48 # mono-gfax.
49-mono @prefix@/lib/gfax/gfax.exe $@
50+@mono@ @pkglibdir@/gfax.exe $@
51--- gfax/gfaxlpr.in.orig 2005-02-01 00:03:09.000000000 +0100
52+++ gfax/gfaxlpr.in 2005-05-03 02:13:55.000000000 +0200
53@@ -16,4 +16,4 @@
54 SPOOL_DIR=@eprefix@/var/spool/gfax
55
56 cat > $SPOOL_DIR/D.$RNAME
57-exec mono @prefix@/lib/gfax/gfax.exe -f $SPOOL_DIR/D.$RNAME &
58+exec @mono@ @pkglibdir@/gfax.exe -f $SPOOL_DIR/D.$RNAME &
59--- gfax/Makefile.am.orig 2005-02-13 00:13:22.000000000 +0100
60+++ gfax/Makefile.am 2005-05-03 02:39:19.000000000 +0200
61@@ -30,11 +30,11 @@
62 bindir=$(prefix)/bin
63
64 gfax: gfax.in config.log
65- sed -e "s|\@prefix\@|$(prefix)|" \
66+ sed -e "s|\@prefix\@|$(prefix)|" -e "s|\@pkglibdir\@|$(pkglibdir)|" -e "s|\@mono\@|$(mono)|" \
67 -e "s|\@eprefix\@|$(eprefix)|" < gfax.in > gfax
68
69 gfaxlpr: gfaxlpr.in config.log
70- sed -e "s|\@prefix\@|$(prefix)|" \
71+ sed -e "s|\@prefix\@|$(prefix)|" -e "s|\@pkglibdir\@|$(pkglibdir)|" -e "s|\@mono\@|$(mono)|" \
72 -e "s|\@eprefix\@|$(eprefix)|" < gfaxlpr.in > gfaxlpr
73
74 INTLTOOL = \
This page took 0.03361 seconds and 4 git commands to generate.