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
8 + libpath "@innlibdir@";
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
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
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
40 -$newslib = "@libdir@";
41 +$newslib = "@innlibdir@";
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
49 includedir = @includedir@
53 sysconfdir = @sysconfdir@
57 PATHINCLUDE = $(includedir)
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
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
78 exec_prefix="@exec_prefix@"
80 +innlibdir="@innlibdir@"
81 libperldir="@LIBPERLDIR@"
83 # We can probably just assume sed is on the path, but since we have it, we may
85 case "$interpreter" in
88 - lib=". $libdir/innshellvars"
89 + lib=". $innlibdir/innshellvars"
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
97 libexecdir=@libexecdir@
99 +innlibdir=@innlibdir@
101 sysconfdir=@sysconfdir@
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
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]])])
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
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 ; \