]>
Commit | Line | Data |
---|---|---|
4e0fee8e | 1 | diff -urN freeradius-server-2.0.3.orig/raddb/radiusd.conf.in freeradius-server-2.0.3/raddb/radiusd.conf.in |
2 | --- freeradius-server-2.0.3.orig/raddb/radiusd.conf.in 2008-03-04 17:53:02.000000000 +0100 | |
3 | +++ freeradius-server-2.0.3/raddb/radiusd.conf.in 2008-04-09 17:00:51.000000000 +0200 | |
4 | @@ -99,7 +99,7 @@ | |
5 | # make | |
6 | # make install | |
7 | # | |
8 | -libdir = @libdir@ | |
9 | +libdir = @libdir@/freeradius | |
10 | ||
11 | # pidfile: Where to place the PID of the RADIUS server. | |
12 | # | |
13 | diff -urN freeradius-server-2.0.3.orig/src/main/mainconfig.c freeradius-server-2.0.3/src/main/mainconfig.c | |
14 | --- freeradius-server-2.0.3.orig/src/main/mainconfig.c 2008-03-06 11:28:36.000000000 +0100 | |
15 | +++ freeradius-server-2.0.3/src/main/mainconfig.c 2008-04-09 17:00:51.000000000 +0200 | |
16 | @@ -171,7 +171,7 @@ | |
17 | { "prefix", PW_TYPE_STRING_PTR, 0, &prefix, "/usr/local"}, | |
18 | { "localstatedir", PW_TYPE_STRING_PTR, 0, &localstatedir, "${prefix}/var"}, | |
19 | { "logdir", PW_TYPE_STRING_PTR, 0, &radlog_dir, "${localstatedir}/log"}, | |
20 | - { "libdir", PW_TYPE_STRING_PTR, 0, &radlib_dir, "${prefix}/lib"}, | |
21 | + { "libdir", PW_TYPE_STRING_PTR, 0, &radlib_dir, "${prefix}/lib/freeradius"}, | |
22 | { "radacctdir", PW_TYPE_STRING_PTR, 0, &radacct_dir, "${logdir}/radacct" }, | |
23 | { "hostname_lookups", PW_TYPE_BOOLEAN, 0, &librad_dodns, "no" }, | |
24 | { "max_request_time", PW_TYPE_INTEGER, 0, &mainconfig.max_request_time, Stringify(MAX_REQUEST_TIME) }, | |
25 | diff -urN freeradius-server-2.0.3.orig/src/modules/rlm_sql/drivers/rules.mak freeradius-server-2.0.3/src/modules/rlm_sql/drivers/rules.mak | |
26 | --- freeradius-server-2.0.3.orig/src/modules/rlm_sql/drivers/rules.mak 2007-06-28 07:11:36.000000000 +0200 | |
27 | +++ freeradius-server-2.0.3/src/modules/rlm_sql/drivers/rules.mak 2008-04-09 17:02:24.000000000 +0200 | |
28 | @@ -101,7 +101,7 @@ | |
29 | $(TARGET).la: $(LT_OBJS) | |
30 | $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ | |
31 | -module $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \ | |
32 | - -rpath $(libdir) $^ $(RLM_SQL_LIBS) | |
33 | + -rpath $(libdir)/freeradius $^ $(RLM_SQL_LIBS) | |
34 | ||
35 | ####################################################################### | |
36 | # | |
37 | @@ -139,12 +139,12 @@ | |
38 | # Do any module-specific installation. | |
39 | # | |
40 | # If there isn't a TARGET defined, then don't do anything. | |
41 | -# Otherwise, install the libraries into $(libdir) | |
42 | +# Otherwise, install the libraries into $(libdir)/freeradius | |
43 | # | |
44 | install: | |
45 | if [ "x$(TARGET)" != "x" ]; then \ | |
46 | $(LIBTOOL) --mode=install $(INSTALL) -c \ | |
47 | - $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \ | |
48 | - rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \ | |
49 | - ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \ | |
50 | + $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \ | |
51 | + rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \ | |
52 | + ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \ | |
53 | fi | |
54 | diff -urN freeradius-server-2.0.3.orig/src/modules/rules.mak freeradius-server-2.0.3/src/modules/rules.mak | |
55 | --- freeradius-server-2.0.3.orig/src/modules/rules.mak 2008-01-10 11:12:01.000000000 +0100 | |
56 | +++ freeradius-server-2.0.3/src/modules/rules.mak 2008-04-09 17:01:23.000000000 +0200 | |
57 | @@ -115,7 +115,7 @@ | |
58 | $(TARGET).la: $(LT_OBJS) | |
59 | $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ | |
60 | -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@ \ | |
61 | - -rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS) | |
62 | + -rpath $(libdir)/freeradius $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS) | |
63 | ||
64 | ####################################################################### | |
65 | # | |
66 | @@ -156,13 +156,13 @@ | |
67 | # Do any module-specific installation. | |
68 | # | |
69 | # If there isn't a TARGET defined, then don't do anything. | |
70 | -# Otherwise, install the libraries into $(libdir) | |
71 | +# Otherwise, install the libraries into $(libdir)/freeradius | |
72 | # | |
73 | install: | |
74 | @[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL) | |
75 | if [ "x$(TARGET)" != "x" ]; then \ | |
76 | $(LIBTOOL) --mode=install $(INSTALL) -c \ | |
77 | - $(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \ | |
78 | - rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \ | |
79 | - ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \ | |
80 | + $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la || exit $$?; \ | |
81 | + rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \ | |
82 | + ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \ | |
83 | fi |