1 Only in freeradius-1.0.1.orig: acinclude.m4
2 diff -dur freeradius-1.0.1.orig/raddb/radiusd.conf.in freeradius-1.0.1/raddb/radiusd.conf.in
3 --- freeradius-1.0.1.orig/raddb/radiusd.conf.in 2004-05-13 22:10:19.000000000 +0200
4 +++ freeradius-1.0.1/raddb/radiusd.conf.in 2004-10-13 10:15:34.997729127 +0200
10 +libdir = @libdir@/freeradius
12 # pidfile: Where to place the PID of the RADIUS server.
14 diff -dur freeradius-1.0.1.orig/src/main/mainconfig.c freeradius-1.0.1/src/main/mainconfig.c
15 --- freeradius-1.0.1.orig/src/main/mainconfig.c 2004-06-08 17:09:40.000000000 +0200
16 +++ freeradius-1.0.1/src/main/mainconfig.c 2004-10-13 10:15:35.010728454 +0200
18 { "prefix", PW_TYPE_STRING_PTR, 0, &prefix, "/usr/local"},
19 { "localstatedir", PW_TYPE_STRING_PTR, 0, &localstatedir, "${prefix}/var"},
20 { "logdir", PW_TYPE_STRING_PTR, 0, &radlog_dir, "${localstatedir}/log"},
21 - { "libdir", PW_TYPE_STRING_PTR, 0, &radlib_dir, "${prefix}/lib"},
22 + { "libdir", PW_TYPE_STRING_PTR, 0, &radlib_dir, "${prefix}/lib/freeradius"},
23 { "radacctdir", PW_TYPE_STRING_PTR, 0, &radacct_dir, "${logdir}/radacct" },
24 { "hostname_lookups", PW_TYPE_BOOLEAN, 0, &librad_dodns, "no" },
26 diff -dur freeradius-1.0.1.orig/src/modules/rlm_sql/drivers/rules.mak freeradius-1.0.1/src/modules/rlm_sql/drivers/rules.mak
27 --- freeradius-1.0.1.orig/src/modules/rlm_sql/drivers/rules.mak 2003-06-05 22:16:54.000000000 +0200
28 +++ freeradius-1.0.1/src/modules/rlm_sql/drivers/rules.mak 2004-10-13 10:17:24.451056585 +0200
30 $(TARGET).la: $(LT_OBJS)
31 $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
32 -module $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \
33 - -rpath $(libdir) $^ $(RLM_SQL_LIBS)
34 + -rpath $(libdir)/freeradius $^ $(RLM_SQL_LIBS)
36 #######################################################################
39 # Do any module-specific installation.
41 # If there isn't a TARGET defined, then don't do anything.
42 -# Otherwise, install the libraries into $(libdir)
43 +# Otherwise, install the libraries into $(libdir)/freeradius
46 - [ "x$(TARGET)" = "x" ] || $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la $(R)$(libdir)/$(TARGET).la
47 + [ "x$(TARGET)" = "x" ] || $(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la
48 diff -dur freeradius-1.0.1.orig/src/modules/rules.mak freeradius-1.0.1/src/modules/rules.mak
49 --- freeradius-1.0.1.orig/src/modules/rules.mak 2002-08-06 18:11:39.000000000 +0200
50 +++ freeradius-1.0.1/src/modules/rules.mak 2004-10-13 10:16:28.824939523 +0200
52 $(TARGET).la: $(LT_OBJS)
53 $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
54 -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@ \
55 - -rpath $(libdir) $^ $(top_builddir)/src/lib/libradius.la \
56 + -rpath $(libdir)/freeradius $^ $(top_builddir)/src/lib/libradius.la \
59 #######################################################################
61 # Do any module-specific installation.
63 # If there isn't a TARGET defined, then don't do anything.
64 -# Otherwise, install the libraries into $(libdir)
65 +# Otherwise, install the libraries into $(libdir)/freeradius
68 @[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
69 if [ "x$(TARGET)" != "x" ]; then \
70 $(LIBTOOL) --mode=install $(INSTALL) -c \
71 - $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
72 - rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
73 - ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
74 + $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \
75 + rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \
76 + ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \