]>
Commit | Line | Data |
---|---|---|
4723171c JB |
1 | --- inn-2.4.3/history/Makefile.orig 2006-03-20 05:14:57.000000000 +0100 |
2 | +++ inn-2.4.3/history/Makefile 2006-03-25 17:54:30.522169000 +0100 | |
3 | @@ -21,7 +21,7 @@ | |
4 | $(MAKE) COPT='$(WARNINGS)' all | |
5 | ||
6 | install: all | |
7 | - $(LI_XPUB) libinnhist.$(EXTLIB) $(D)$(PATHLIB)/libinnhist.$(EXTLIB) | |
8 | + $(LI_XPUB) libinnhist.$(EXTLIB) $(D)$(PATHSLIB)/libinnhist.$(EXTLIB) | |
9 | ||
10 | library: libinnhist.$(EXTLIB) | |
11 | ||
12 | @@ -44,7 +44,7 @@ | |
13 | libinnhist.la: $(OBJECTS) $(LIBSTORAGE) $(LIBINN) | |
14 | $(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \ | |
15 | $(LIBSTORAGE) $(LIBINN) $(EXTSTORAGELIBS) $(LIBS) \ | |
16 | - -rpath $(PATHLIB) -version-info 2:0:0 | |
17 | + -rpath $(PATHSLIB) -version-info 2:0:0 | |
18 | ||
19 | libinnhist.a: $(OBJECTS) | |
20 | ar r $@ $(OBJECTS) | |
21 | --- inn-2.4.3/lib/Makefile.orig 2006-03-20 05:14:57.000000000 +0100 | |
22 | +++ inn-2.4.3/lib/Makefile 2006-03-25 17:54:11.484979250 +0100 | |
23 | @@ -33,7 +33,7 @@ | |
24 | $(MAKE) COPT='$(WARNINGS)' all | |
25 | ||
26 | install: all | |
27 | - $(LI_XPUB) libinn.$(EXTLIB) $D$(PATHLIB)/libinn.$(EXTLIB) | |
28 | + $(LI_XPUB) libinn.$(EXTLIB) $D$(PATHSLIB)/libinn.$(EXTLIB) | |
29 | ||
30 | clobber clean distclean: | |
31 | rm -f *.o *.lo libinn.la libinn.a parsedate.c parsedate | |
32 | @@ -46,7 +46,7 @@ | |
33 | ||
34 | libinn.la: $(OBJECTS) $(LOBJECTS) | |
35 | $(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) $(LIBS) \ | |
36 | - -rpath $(PATHLIB) -version-info 2:0:0 | |
37 | + -rpath $(PATHSLIB) -version-info 2:0:0 | |
38 | ||
39 | libinn.a: $(OBJECTS) | |
40 | ar r $@ $(OBJECTS) | |
41 | --- inn-2.4.3/storage/Makefile.orig 2006-03-20 05:14:57.000000000 +0100 | |
42 | +++ inn-2.4.3/storage/Makefile 2006-03-25 17:53:58.652177250 +0100 | |
43 | @@ -22,7 +22,7 @@ | |
44 | $(MAKE) COPT='$(WARNINGS)' all | |
45 | ||
46 | install: all | |
47 | - $(LI_XPUB) libstorage.$(EXTLIB) $D$(PATHLIB)/libstorage.$(EXTLIB) | |
48 | + $(LI_XPUB) libstorage.$(EXTLIB) $D$(PATHSLIB)/libstorage.$(EXTLIB) | |
49 | for F in $(PROGRAMS) ; do \ | |
50 | $(LI_XPRI) $$F $D$(PATHBIN)/`basename $$F` ; \ | |
51 | done | |
52 | @@ -48,7 +48,7 @@ | |
53 | libstorage.la: $(OBJECTS) $(LIBINN) | |
54 | $(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \ | |
55 | $(LIBINN) $(EXTSTORAGELIBS) $(LIBS) \ | |
56 | - -rpath $(PATHLIB) -version-info 2:0:0 | |
57 | + -rpath $(PATHSLIB) -version-info 2:0:0 | |
58 | ||
59 | libstorage.a: $(OBJECTS) | |
60 | ar r $@ $(OBJECTS) | |
61 | --- inn-2.4.3/Makefile.orig 2006-03-25 17:41:17.840629000 +0100 | |
62 | +++ inn-2.4.3/Makefile 2006-03-25 17:53:18.333657500 +0100 | |
63 | @@ -6,7 +6,7 @@ | |
64 | ## different mode than the rest. | |
65 | INSTDIRS = $(PATHNEWS) $(PATHBIN) $(PATHAUTH) $(PATHAUTHRESOLV) \ | |
66 | $(PATHAUTHPASSWD) $(PATHCONTROL) $(PATHFILTER) \ | |
67 | - $(PATHRNEWS) $(PATHDB) $(PATHDOC) $(PATHETC) $(PATHLIB) \ | |
68 | + $(PATHRNEWS) $(PATHDB) $(PATHDOC) $(PATHETC) $(PATHLIB) $(PATHSLIB) \ | |
69 | $(PATHMAN) $(MAN1) $(MAN3) $(MAN5) $(MAN8) $(PATHSPOOL) \ | |
70 | $(PATHTMP) $(PATHARCHIVE) $(PATHARTICLES) $(PATHINCOMING) \ | |
71 | $(PATHINBAD) $(PATHTAPE) $(PATHOVERVIEW) $(PATHOUTGOING) \ | |
72 | --- inn-2.4.3/Makefile.global.in.orig 2006-03-25 17:41:17.924634000 +0100 | |
73 | +++ inn-2.4.3/Makefile.global.in 2006-03-25 17:53:38.622925500 +0100 | |
74 | @@ -202,6 +202,7 @@ | |
75 | PATHMAN = @mandir@ | |
76 | PATHINCLUDE = @includedir@ | |
77 | PATHLIB = @LIBDIR@ | |
78 | +PATHSLIB = @libdir@ | |
79 | PATHCONTROL = @CONTROLDIR@ | |
80 | PATHFILTER = @FILTERDIR@ | |
81 | PATHRUN = @RUNDIR@ |