File pilot-mailsync-0.9.1.diff of Package pilot-mailsync

Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -98,7 +98,7 @@ fi
 # but where?)
 # XXX is this really needed? maybe just use headers' directory (- "/include")
 AC_MSG_CHECKING([for pilot-link libraries])
-find_libloc "pisock" "$pilotlink_loc/lib /lib /usr/lib /usr/local/lib"
+find_libloc "pisock" "$pilotlink_loc/lib /lib /usr/lib /usr/local/lib $pilotlink_loc/lib64 /lib64 /usr/lib64 /usr/local/lib64"
 if test -z "$foundloc" ; then
 	AC_MSG_ERROR([
 
@@ -122,7 +122,7 @@ if test "$enable_ssl" = "yes" ; then
 	# they want SSL; find it
 	AC_MSG_CHECKING([for OpenSSL libraries])
 
-	find_libloc "ssl" "/lib /usr/lib /usr/lib/openssl /usr/local/lib /usr/local/openssl/lib"
+	find_libloc "ssl" "/lib64 /usr/lib64 /usr/lib64/openssl /usr/local/lib64 /usr/local/openssl/lib64 /lib /usr/lib /usr/lib/openssl /usr/local/lib /usr/local/openssl/lib"
 	ssl_libloc=$foundloc
 
 	if test -n "$ssl_libloc" ; then
Index: imap-2004g/Makefile
===================================================================
--- imap-2004g/Makefile.orig
+++ imap-2004g/Makefile
@@ -242,7 +242,7 @@ IP=4
 #	British.  As of 2005, the Julian calendar and the Gregorian calendar
 #	diverge by 15 days.
 
-EXTRACFLAGS=
+EXTRACFLAGS=-fPIC
 
 
 # Extra linker flags (additional/alternative libraries, etc.)
Index: imap-2004g/src/osdep/unix/Makefile
===================================================================
--- imap-2004g/src/osdep/unix/Makefile.orig
+++ imap-2004g/src/osdep/unix/Makefile
@@ -129,7 +129,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o
  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
  unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
-CFLAGS=-g
+#CFLAGS=-g
 
 CAT=cat
 MAKE=make
@@ -455,7 +455,7 @@ lnp:	# Linux Pluggable Authentication mo
 	 SPOOLDIR=/var/spool \
 	 ACTIVEFILE=/var/lib/news/active \
 	 RSHPATH=/usr/bin/rsh \
-	 BASECFLAGS="-g -fno-omit-frame-pointer $(GCCOPTLEVEL)" \
+	 BASECFLAGS="$(EXTRABASECFLAGS) -g -fno-omit-frame-pointer $(GCCOPTLEVEL)" \
 	 BASELDFLAGS="$(PAMLDFLAGS)"
 
 lnx:	# Linux non-shadow passwords
Index: Makefile.in
===================================================================
--- Makefile.in.orig
+++ Makefile.in
@@ -33,7 +33,7 @@ INSTALL = @INSTALL@
 LIBTOOL = libtool
 
 
-CFLAGS := -Wall @CFLAGS@ -I$(IMAPDIR)
+CFLAGS := -Wall @CFLAGS@ -I$(IMAPDIR) -I.
 CPPFLAGS := @CPPFLAGS@ @DEFS@
 
 LDFLAGS := @LDFLAGS@
@@ -110,7 +110,7 @@ $(IMAPDIR)/c-client/libc-client.a: $(IMA
 
 libgnome_mailsync_conduit.la: $(LOBJS) 
 	$(LIBTOOL) --mode=link \
-	$(CC) $(OPTIONS) -o libgnome_mailsync_conduit.la \
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(OPTIONS) -o libgnome_mailsync_conduit.la \
 	$(LOBJS) \
 	-rpath $(prefix)/lib/gnome-pilot/conduits \
 	-version-info 1:1 \
@@ -118,11 +118,11 @@ libgnome_mailsync_conduit.la: $(LOBJS)
 	-lc-client -L$(CCLIENTDIR) -lpam -lssl
 
 gplugin_install:
-	$(INSTALL) -d -m 755 $(GNOMEPILOTCONFIGDIR); \
-	$(INSTALL) -m 644 mailsync.conduit $(GNOMEPILOTCONFIGDIR); \
-	$(INSTALL) -d -m 755 $(GNOMEPILOTCONDUITDIR); \
+	$(INSTALL) -d -m 755 $(RPM_BUILD_ROOT)/$(GNOMEPILOTCONFIGDIR); \
+	$(INSTALL) -m 644 mailsync.conduit $(RPM_BUILD_ROOT)/$(GNOMEPILOTCONFIGDIR); \
+	$(INSTALL) -d -m 755 $(RPM_BUILD_ROOT)/$(GNOMEPILOTCONDUITDIR); \
 	$(INSTALL) -m 755 .libs/libgnome_mailsync_conduit.so \
-	$(GNOMEPILOTCONDUITDIR)
+	$(RPM_BUILD_ROOT)/$(GNOMEPILOTCONDUITDIR)
 
 %.lo: %.c
 	$(LIBTOOL) --mode=compile \