- use libdir to allow build on amd64

Changed files:
    chmlib-LIBDIR.patch -> 1.1
    chmlib.spec -> 1.13

diff --git a/chmlib-LIBDIR.patch b/chmlib-LIBDIR.patch
new file mode 100644 (file)
index 0000000..137d14d
--- /dev/null
+++ b/chmlib-LIBDIR.patch
@@ -0,0 +1,46 @@
+--- Makefile~  2002-10-10 05:25:54.000000000 +0200
++++ Makefile   2004-12-27 17:05:51.482129376 +0100
+@@ -10,6 +10,7 @@
+ CFLAGS=-DCHM_MT -DCHM_USE_PREAD -DCHM_USE_IO64 -g -DDMALLOC_DISABLE
+ LDFLAGS=-lpthread
+ INSTALLPREFIX=/usr/local/
++LIBDIR=/usr/local/lib
+ CC=gcc-3.2
+ LD=gcc-3.2
+ LIBTOOL=libtool
+@@ -24,28 +25,28 @@
+       ${LIBTOOL} ${CC} -c -o $@ $^ ${CFLAGS}
+ 
+ libchm.la: chm_lib.lo lzx.lo
+-      ${LIBTOOL} ${LD} -o $@ $^ ${LDFLAGS} -rpath ${INSTALLPREFIX}/lib
++      ${LIBTOOL} ${LD} -o $@ $^ ${LDFLAGS} -rpath ${LIBDIR}
+ 
+ install: libchm.la
+       chmod a+r libchm.la
+-      ${LIBTOOL} --mode=install ${CP} libchm.la ${INSTALLPREFIX}/lib
++      ${LIBTOOL} --mode=install ${CP} libchm.la ${LIBDIR}
+       ${CP} chm_lib.h ${INSTALLPREFIX}/include
+ 
+ clean:
+       rm -fr libchm.la *.o *.lo .libs ${EXAMPLES}
+ 
+ test_chmLib: test_chmLib.c
+-      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
++      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
+ 
+ enum_chmLib: enum_chmLib.c
+-      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
++      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
+ 
+ enumdir_chmLib: enumdir_chmLib.c
+-      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
++      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
+ 
+ extract_chmLib: extract_chmLib.c
+-      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
++      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
+ 
+ chm_http: chm_http.c
+-      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm -lpthread ${CFLAGS}
++      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm -lpthread ${CFLAGS}
+ 

diff --git a/chmlib.spec b/chmlib.spec
index b5e9d6f413defb81a536db13b25f54d660067ca4..240f16b8a7fb3b4a20e9bb71fbd1a222af2d70a1 100644 (file)
--- a/chmlib.spec
+++ b/chmlib.spec
@@ -7,6 +7,7 @@ License:        GPL
 Group:         Libraries
 Source0:       http://66.93.236.84/~jedwin/projects/chmlib/%{name}-%{version}.tbz
 Patch0:                %{name}-morearchs.patch
+Patch1:                %{name}-LIBDIR.patch
 # Source0-md5: c6c9e1658f43715456e00a4893d496ed
 URL:           http://66.93.236.84/~jedwin/projects/chmlib/
 BuildRequires: libtool
@@ -53,6 +54,7 @@ Statyczna wersja chmlib.
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 
 %build
 %{__make} all examples \
@@ -60,14 +62,16 @@ Statyczna wersja chmlib.
        LDFLAGS="%{rpmldflags} -lpthread" \
        CC="%{__cc}" \
        LD="%{__cc}" \
-       INSTALLPREFIX="%{_prefix}"
+       INSTALLPREFIX="%{_prefix}" \
+       LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_bindir}}
 
 %{__make} install \
-       INSTALLPREFIX=$RPM_BUILD_ROOT%{_prefix}
+       INSTALLPREFIX=$RPM_BUILD_ROOT%{_prefix} \
+       LIBDIR=$RPM_BUILD_ROOT%{_libdir}
 
 install *_chmLib chm_http $RPM_BUILD_ROOT%{_bindir}