- old one obsolete; for 0.37 change manual install to libtool --mode=install (and...

Changed files:
    chmlib-LIBDIR.patch -> 1.5

diff --git a/chmlib-LIBDIR.patch b/chmlib-LIBDIR.patch
index 3516bfaffefaca2ef765ad301f2cdf4d3eedaa22..31b90e4702ea7452f0771893aaf1af83530d30ee 100644 (file)
--- a/chmlib-LIBDIR.patch
+++ b/chmlib-LIBDIR.patch
@@ -1,47 +1,17 @@
---- chmlib-0.36/Makefile.in.orig       2005-09-09 14:38:57.000000000 +0200
-+++ chmlib-0.36/Makefile.in    2005-09-19 14:29:26.000000000 +0200
-@@ -11,6 +11,7 @@
- CFLAGS=@CFLAGS@ @CHM_MT@ @CHM_USE_PREAD@ @CHM_USE_IO64@ @DMALLOC_DISABLE@ 
- LDFLAGS=@LDFLAGS@
- INSTALLPREFIX=@prefix@
-+LIBDIR=@libdir@
- CC=@CC@
- top_builddir=@top_builddir@
- ifeq ($(top_builddir),)
-@@ -28,29 +29,29 @@
-       ${LIBTOOL} --mode=compile ${CC} -c -o $@ $^ ${CFLAGS}
- 
- src/libchm.la: src/chm_lib.lo src/lzx.lo
--      ${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath ${INSTALLPREFIX}/lib
-+      ${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath ${LIBDIR}
+--- chmlib-0.37/Makefile.in.orig       2005-10-27 14:04:34.000000000 +0200
++++ chmlib-0.37/Makefile.in    2005-10-28 00:32:04.866327152 +0200
+@@ -33,13 +33,9 @@
+       ${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath $(libdir)

  
  install: src/libchm.la
  
  install: src/libchm.la

-       chmod a+r src/libchm.la
-       mkdir -p ${INSTALLPREFIX}
--      ${LIBTOOL} --mode=install cp src/libchm.la ${INSTALLPREFIX}/lib
-+      ${LIBTOOL} --mode=install cp src/libchm.la ${LIBDIR}
-       cp $(srcdir)/src/chm_lib.h ${INSTALLPREFIX}/include
+-      chmod a+r src/libchm.la
+       mkdir -p $(DESTDIR)$(prefix) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+-      install -m0755 src/libchm.la $(DESTDIR)$(libdir)/
++      ${LIBTOOL} --mode=install install src/libchm.la $(DESTDIR)$(libdir)/
+       install -m0644 $(srcdir)/src/chm_lib.h $(DESTDIR)$(includedir)/
+-      install -m0755 src/.libs/libchm.so.0.0.0 $(DESTDIR)$(libdir)/
+-      ln -s $(libdir)/libchm.so.0.0.0 $(DESTDIR)$(libdir)/libchm.so
+-      ln -s $(libdir)/libchm.so.0.0.0 $(DESTDIR)$(libdir)/libchm.so.0

  
  clean:
        rm -fr src/libchm.la src/*.o src/*.lo .libs src/.libs src/${EXAMPLES}
  
  clean:
        rm -fr src/libchm.la src/*.o src/*.lo .libs src/.libs src/${EXAMPLES}

- 
- test_chmLib: $(srcdir)/src/test_chmLib.c
--      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
-+      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
- 
- enum_chmLib: $(srcdir)/src/enum_chmLib.c
--      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
-+      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
- 
- enumdir_chmLib: $(srcdir)/src/enumdir_chmLib.c
--      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
-+      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
- 
- extract_chmLib: $(srcdir)/src/extract_chmLib.c
--      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
-+      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
- 
- chm_http: $(srcdir)/src/chm_http.c
--      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm -lpthread ${CFLAGS}
-+      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm -lpthread ${CFLAGS}
-