freeradius-moduledir.patch

   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
   5 @@ -71,7 +71,7 @@
   6  #      make
   7  #      make install
   8  #
   9 -libdir = @libdir@
  10 +libdir = @libdir@/freeradius
  11
  12  #  pidfile: Where to place the PID of the RADIUS server.
  13  #
  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
  17 @@ -103,7 +103,7 @@
  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" },
  25  #ifdef WITH_SNMP
  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
  29 @@ -93,7 +93,7 @@
  30  $(TARGET).la: $(DYNAMIC_OBJS)
  31         $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
  32         -module $(LINK_MODE) $(CFLAGS) \
  33 -       $(RLM_SQL_CFLAGS) -o $@ -rpath $(libdir) $^ $(RLM_SQL_LIBS)
  34 +       $(RLM_SQL_CFLAGS) -o $@ -rpath $(libdir)/freeradius $^ $(RLM_SQL_LIBS)
  35
  36  #######################################################################
  37  #
  38 @@ -143,7 +143,7 @@
  39  #  Do any module-specific installation.
  40  #
  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
  44  #
  45  install:
  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
  51 @@ -96,7 +96,7 @@
  52  $(TARGET).la: $(DYNAMIC_OBJS)
  53         $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
  54         -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) \
  55 -       -o $@ -rpath $(libdir) $^ $(RLM_LIBS) $(LIBS)
  56 +       -o $@ -rpath $(libdir)/freeradius $^ $(RLM_LIBS) $(LIBS)
  57
  58  #######################################################################
  59  #
  60 @@ -151,13 +151,13 @@
  61  #  Do any module-specific installation.
  62  #
  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
  66  #
  67  install:
  68         if [ "x$(TARGET)" != "x" ]; then \
  69             $(LIBTOOL) --mode=install $(INSTALL) -c \
  70 -               $(TARGET).la $(R)$(libdir)/$(TARGET).la; \
  71 -           rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
  72 -           ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $?; \
  73 +               $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET).la; \
  74 +           rm -f $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la; \
  75 +           ln -s $(TARGET).la $(R)$(libdir)/freeradius/$(TARGET)-$(RADIUSD_VERSION).la || exit $?; \
  76         fi
  77         @[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)