]>
Commit | Line | Data |
---|---|---|
afb37e8b | 1 | --- chmlib-0.36/Makefile.in.orig 2005-09-09 14:38:57.000000000 +0200 |
2 | +++ chmlib-0.36/Makefile.in 2005-09-19 14:29:26.000000000 +0200 | |
c5f833be | 3 | @@ -11,6 +11,7 @@ |
e534a5c8 JB |
4 | CFLAGS=@CFLAGS@ @CHM_MT@ @CHM_USE_PREAD@ @CHM_USE_IO64@ @DMALLOC_DISABLE@ |
5 | LDFLAGS=@LDFLAGS@ | |
6 | INSTALLPREFIX=@prefix@ | |
7 | +LIBDIR=@libdir@ | |
8 | CC=@CC@ | |
9 | top_builddir=@top_builddir@ | |
c5f833be | 10 | ifeq ($(top_builddir),) |
afb37e8b | 11 | @@ -28,29 +29,29 @@ |
c5f833be | 12 | ${LIBTOOL} --mode=compile ${CC} -c -o $@ $^ ${CFLAGS} |
13 | ||
14 | src/libchm.la: src/chm_lib.lo src/lzx.lo | |
15 | - ${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath ${INSTALLPREFIX}/lib | |
16 | + ${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath ${LIBDIR} | |
17 | ||
18 | install: src/libchm.la | |
19 | chmod a+r src/libchm.la | |
afb37e8b | 20 | mkdir -p ${INSTALLPREFIX} |
c5f833be | 21 | - ${LIBTOOL} --mode=install cp src/libchm.la ${INSTALLPREFIX}/lib |
22 | + ${LIBTOOL} --mode=install cp src/libchm.la ${LIBDIR} | |
afb37e8b | 23 | cp $(srcdir)/src/chm_lib.h ${INSTALLPREFIX}/include |
178949c7 | 24 | |
25 | clean: | |
c5f833be | 26 | rm -fr src/libchm.la src/*.o src/*.lo .libs src/.libs src/${EXAMPLES} |
178949c7 | 27 | |
afb37e8b | 28 | test_chmLib: $(srcdir)/src/test_chmLib.c |
178949c7 | 29 | - ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS} |
30 | + ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS} | |
31 | ||
afb37e8b | 32 | enum_chmLib: $(srcdir)/src/enum_chmLib.c |
178949c7 | 33 | - ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS} |
34 | + ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS} | |
35 | ||
afb37e8b | 36 | enumdir_chmLib: $(srcdir)/src/enumdir_chmLib.c |
178949c7 | 37 | - ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS} |
38 | + ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS} | |
39 | ||
afb37e8b | 40 | extract_chmLib: $(srcdir)/src/extract_chmLib.c |
178949c7 | 41 | - ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS} |
42 | + ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS} | |
43 | ||
afb37e8b | 44 | chm_http: $(srcdir)/src/chm_http.c |
178949c7 | 45 | - ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm -lpthread ${CFLAGS} |
46 | + ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm -lpthread ${CFLAGS} | |
47 |