]>
Commit | Line | Data |
---|---|---|
6a4c3728 JB |
1 | --- inn-2.5.3/samples/innreport.conf.in.orig 2012-06-15 20:25:36.000000000 +0200 |
2 | +++ inn-2.5.3/samples/innreport.conf.in 2013-06-14 19:59:36.165132651 +0200 | |
3 | @@ -10,7 +10,7 @@ | |
4723171c | 4 | |
6a4c3728 JB |
5 | # Default parameters |
6 | section default { | |
7 | - libpath "@libdir@"; | |
8 | + libpath "@innlibdir@"; | |
9 | logpath "@LOGDIR@"; | |
10 | unknown true; # want unknown entries. | |
11 | html-unknown true; # want unknown entries in HTML reports. | |
12 | --- inn-2.5.3/scripts/innshellvars.tcl.in.orig 2012-06-15 20:25:36.000000000 +0200 | |
13 | +++ inn-2.5.3/scripts/innshellvars.tcl.in 2013-06-14 20:10:44.008452064 +0200 | |
14 | @@ -23,7 +23,7 @@ | |
4723171c | 15 | |
6a4c3728 JB |
16 | set inn_newsbin "${inn_pathbin}" |
17 | set inn_newsetc "${inn_pathetc}" | |
18 | -set inn_newslib "@libdir@" | |
19 | +set inn_newslib "@innlibdir@" | |
20 | set inn_innddir "${inn_pathrun}" | |
21 | set inn_locks "${inn_pathrun}" | |
22 | set env(NEWSBIN) "$inn_newsbin" | |
23 | --- inn-2.5.3/scripts/innshellvars.in.orig 2012-06-15 20:25:36.000000000 +0200 | |
24 | +++ inn-2.5.3/scripts/innshellvars.in 2013-06-14 20:30:54.805093495 +0200 | |
25 | @@ -20,7 +20,7 @@ | |
4723171c | 26 | |
6a4c3728 JB |
27 | NEWSBIN=${PATHBIN} |
28 | NEWSETC=${PATHETC} | |
29 | -NEWSLIB=@libdir@ | |
30 | +NEWSLIB=@innlibdir@ | |
31 | INNDDIR=${PATHRUN} | |
32 | LOCKS=${PATHRUN} | |
33 | export NEWSBIN NEWSETC NEWSLIB INNDDIR LOCKS | |
34 | --- inn-2.5.3/scripts/innshellvars.pl.in.orig 2012-06-15 20:25:36.000000000 +0200 | |
35 | +++ inn-2.5.3/scripts/innshellvars.pl.in 2013-06-14 20:31:17.728426352 +0200 | |
36 | @@ -28,7 +28,7 @@ | |
4723171c | 37 | |
6a4c3728 JB |
38 | $newsbin = $pathbin; |
39 | $newsetc = $pathetc; | |
40 | -$newslib = "@libdir@"; | |
41 | +$newslib = "@innlibdir@"; | |
42 | $innddir = $pathrun; | |
43 | $locks = $pathrun; | |
44 | $ENV{'NEWSBIN'} = $newsbin; | |
45 | --- inn-2.5.3/Makefile.global.in.orig 2013-06-14 15:36:10.805462084 +0200 | |
46 | +++ inn-2.5.3/Makefile.global.in 2013-06-14 21:05:53.935049745 +0200 | |
47 | @@ -225,6 +225,7 @@ | |
48 | docdir = @docdir@ | |
49 | includedir = @includedir@ | |
50 | libdir = @libdir@ | |
51 | +datadir = @datadir@ | |
52 | mandir = @mandir@ | |
53 | sysconfdir = @sysconfdir@ | |
54 | tmpdir = @tmpdir@ | |
55 | @@ -237,6 +238,7 @@ | |
56 | PATHMAN = $(mandir) | |
57 | PATHINCLUDE = $(includedir) | |
58 | PATHLIB = $(libdir) | |
59 | +PATHINNLIB = @innlibdir@ | |
60 | PATHLIBPERL = @LIBPERLDIR@ | |
61 | PATHCONTROL = @CONTROLDIR@ | |
62 | PATHFILTER = @FILTERDIR@ | |
63 | --- inn-2.5.3/perl/INN/Config.pm.in.orig 2012-06-15 20:25:36.000000000 +0200 | |
64 | +++ inn-2.5.3/perl/INN/Config.pm.in 2013-06-14 21:06:40.531715437 +0200 | |
65 | @@ -37,7 +37,7 @@ | |
66 | $spooltemp $path); | |
67 | our $newshome = $pathnews; | |
68 | our $home = $pathnews; | |
69 | -our $newslib = "@libdir@"; | |
70 | +our $newslib = "@innlibdir@"; | |
71 | our $newsbin = $pathbin; | |
72 | our $controlprogs = $pathcontrol; | |
73 | our $newslbin = "$pathnews/local"; | |
74 | --- inn-2.5.3/support/fixscript.in.orig 2012-06-15 20:25:36.000000000 +0200 | |
75 | +++ inn-2.5.3/support/fixscript.in 2013-06-14 21:08:38.721712975 +0200 | |
76 | @@ -25,6 +25,7 @@ | |
77 | prefix="@prefix@" | |
78 | exec_prefix="@exec_prefix@" | |
79 | libdir="@libdir@" | |
80 | +innlibdir="@innlibdir@" | |
81 | libperldir="@LIBPERLDIR@" | |
4723171c | 82 | |
6a4c3728 JB |
83 | # We can probably just assume sed is on the path, but since we have it, we may |
84 | @@ -60,7 +61,7 @@ | |
85 | case "$interpreter" in | |
86 | */sh|*SH*) | |
87 | path="@SHELL@" | |
88 | - lib=". $libdir/innshellvars" | |
89 | + lib=". $innlibdir/innshellvars" | |
90 | ;; | |
91 | */perl*|*PERL*) | |
92 | path=`echo "$interpreter" | sed 's%^#! *[^ ][^ ]*%'"$PERLPATH%"` | |
93 | --- inn-2.5.3/support/fixconfig.in.orig 2012-06-15 20:25:36.000000000 +0200 | |
94 | +++ inn-2.5.3/support/fixconfig.in 2013-06-14 21:09:38.871711720 +0200 | |
95 | @@ -17,6 +17,7 @@ | |
96 | bindir=@bindir@ | |
97 | libexecdir=@libexecdir@ | |
98 | libdir=@libdir@ | |
99 | +innlibdir=@innlibdir@ | |
100 | sbindir=@sbindir@ | |
101 | sysconfdir=@sysconfdir@ | |
4723171c | 102 | |
6a4c3728 JB |
103 | @@ -59,6 +60,7 @@ |
104 | -e "s,@bindir[@],$bindir,g" \ | |
105 | -e "s,@libexecdir[@],$libexecdir,g" \ | |
106 | -e "s,@libdir[@],$libdir,g" \ | |
107 | + -e "s,@innlibdir[@],$innlibdir,g" \ | |
108 | -e "s,@sbindir[@],$sbindir,g" \ | |
109 | -e "s,@sysconfdir[@],$sysconfdir,g" \ | |
110 | -e "s,@CONTROLDIR[@],$CONTROLDIR,g" \ | |
111 | --- inn-2.5.3/m4/paths.m4.orig 2012-06-15 20:25:36.000000000 +0200 | |
112 | +++ inn-2.5.3/m4/paths.m4 2013-06-14 21:13:15.238373880 +0200 | |
113 | @@ -47,6 +47,9 @@ | |
114 | _INN_ARG_DIR([tmp], ['${prefix}/tmp'], [tmpdir], | |
115 | [AS_HELP_STRING([--with-tmp-dir=PATH], | |
116 | [Path for temporary files [PREFIX/tmp]])]) | |
117 | +_INN_ARG_DIR([innlib], ['${datadir}/news'], [innlibdir], | |
118 | + [AS_HELP_STRING([--with-innlib-dir=PATH], | |
119 | + [Path to inn library scripts [DATADIR/news]])]) | |
4723171c | 120 | |
6a4c3728 JB |
121 | dnl Some additional paths used by inn/paths.h. |
122 | eval PATH_CONFIG="$sysconfdir" | |
123 | --- inn-2.5.3/scripts/Makefile.orig 2012-06-15 20:25:36.000000000 +0200 | |
124 | +++ inn-2.5.3/scripts/Makefile 2013-06-14 21:14:08.268372773 +0200 | |
125 | @@ -27,7 +27,7 @@ | |
126 | done | |
127 | for F in innreport_inn.pm innshellvars innshellvars.pl \ | |
128 | innshellvars.tcl ; do \ | |
129 | - $(CP_RPUB) $$F $D$(PATHLIB)/$$F ; \ | |
130 | + $(CP_RPUB) $$F $D$(PATHINNLIB)/$$F ; \ | |
4723171c | 131 | done |
4723171c | 132 | |
6a4c3728 | 133 | bootstrap: |