[OTR-dev] Build on x86_64

[Ian Goldberg]

On Fri, Dec 17, 2004 at 02:33:07PM -0500, Neal D. Becker wrote:
> Thanks, but fixing #1 without fixing #2 won't help - rpmbuild will give an 
> error when make install puts the file in /usr/lib and then spec 
> says /usr/lib64, unless maybe you mv the file as part of the install in spec.

Would this patch work?  Can someone on x64 try it?

Index: gaim-otr/Makefile
===================================================================
RCS file: /home/nikitab/.CVS-nbig/secim/src/gaim-otr/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- gaim-otr/Makefile	9 Dec 2004 18:51:38 -0000	1.7
+++ gaim-otr/Makefile	17 Dec 2004 20:47:53 -0000
@@ -11,7 +11,8 @@
 TARGET = ../gaim-otr.so
 
 # Install directory
-INSTALLDIR = $(DESTDIR)/usr/lib/gaim
+GAIMDIR = /usr/lib/gaim
+INSTALLDIR = $(DESTDIR)$(GAIMDIR)
 
 CC ?= gcc
 override CFLAGS += -g -Wall -I$(GAIM_SOURCE) $(GTK_HDRS) -I$(LIBOTR_DIR) -fPIC
Index: packaging/fedora/gaim-otr.spec
===================================================================
RCS file: /home/nikitab/.CVS-nbig/secim/src/packaging/fedora/gaim-otr.spec,v
retrieving revision 1.13
diff -u -r1.13 gaim-otr.spec
--- packaging/fedora/gaim-otr.spec	17 Dec 2004 19:56:08 -0000	1.13
+++ packaging/fedora/gaim-otr.spec	17 Dec 2004 20:47:53 -0000
@@ -59,6 +59,7 @@
 #install -d -m755  %{buildroot}/usr/share/doc/gaim-otr
 %{__make} \
 	DESTDIR=${RPM_BUILD_ROOT} \
+	GAIMDIR=%{_libdir}/gaim \
 	install
 
 %clean