michael@13: Index: configure michael@13: --- configure.orig 2007-02-05 13:53:08 +0100 michael@13: +++ configure 2007-02-05 17:15:19 +0100 michael@13: @@ -2580,7 +2580,7 @@ michael@13: LIBVERSION=2:0:0 michael@13: michael@13: michael@13: -pkgsysconfdir=${sysconfdir}/$PACKAGE michael@13: +pkgsysconfdir=${sysconfdir} michael@13: michael@13: michael@13: # Check whether --enable-shared was given. michael@13: Index: lib/Makefile.in michael@13: --- lib/Makefile.in.orig 2007-02-05 14:02:08 +0100 michael@13: +++ lib/Makefile.in 2007-02-05 17:17:41 +0100 michael@13: @@ -204,7 +204,7 @@ michael@13: AUTOMAKE_OPTIONS = foreign michael@13: INCLUDES = -I$(srcdir) -I$(top_srcdir)/include -I$(top_builddir) michael@13: CLEANFILES = *~ michael@13: -lib_LTLIBRARIES = libradiusclient-ng.la michael@13: +lib_LTLIBRARIES = libradiusclient.la michael@13: libradiusclient_ng_la_SOURCES = buildreq.c clientid.c env.c sendserver.c \ michael@13: avpair.c config.c dict.c ip_util.c log.c md5.c util.c lock.c \ michael@13: options.h md5.h michael@13: @@ -270,7 +270,7 @@ michael@13: echo "rm -f \"$${dir}/so_locations\""; \ michael@13: rm -f "$${dir}/so_locations"; \ michael@13: done michael@13: -libradiusclient-ng.la: $(libradiusclient_ng_la_OBJECTS) $(libradiusclient_ng_la_DEPENDENCIES) michael@13: +libradiusclient.la: $(libradiusclient_ng_la_OBJECTS) $(libradiusclient_ng_la_DEPENDENCIES) michael@13: $(libradiusclient_ng_la_LINK) -rpath $(libdir) $(libradiusclient_ng_la_OBJECTS) $(libradiusclient_ng_la_LIBADD) $(LIBS) michael@13: michael@13: mostlyclean-compile: michael@13: Index: src/Makefile.in michael@13: --- src/Makefile.in.orig 2007-02-05 14:02:08 +0100 michael@13: +++ src/Makefile.in 2007-02-05 17:18:08 +0100 michael@13: @@ -62,24 +62,24 @@ michael@13: am_radacct_OBJECTS = radacct.$(OBJEXT) michael@13: radacct_OBJECTS = $(am_radacct_OBJECTS) michael@13: radacct_LDADD = $(LDADD) michael@13: -radacct_DEPENDENCIES = ../lib/libradiusclient-ng.la michael@13: +radacct_DEPENDENCIES = ../lib/libradiusclient.la michael@13: am_radexample_OBJECTS = radexample.$(OBJEXT) michael@13: radexample_OBJECTS = $(am_radexample_OBJECTS) michael@13: radexample_LDADD = $(LDADD) michael@13: -radexample_DEPENDENCIES = ../lib/libradiusclient-ng.la michael@13: +radexample_DEPENDENCIES = ../lib/libradiusclient.la michael@13: am_radiusclient_OBJECTS = radiusclient.$(OBJEXT) michael@13: radiusclient_OBJECTS = $(am_radiusclient_OBJECTS) michael@13: radiusclient_LDADD = $(LDADD) michael@13: -radiusclient_DEPENDENCIES = ../lib/libradiusclient-ng.la michael@13: +radiusclient_DEPENDENCIES = ../lib/libradiusclient.la michael@13: am_radlogin_OBJECTS = radlogin.$(OBJEXT) radius.$(OBJEXT) \ michael@13: local.$(OBJEXT) michael@13: radlogin_OBJECTS = $(am_radlogin_OBJECTS) michael@13: radlogin_LDADD = $(LDADD) michael@13: -radlogin_DEPENDENCIES = ../lib/libradiusclient-ng.la michael@13: +radlogin_DEPENDENCIES = ../lib/libradiusclient.la michael@13: am_radstatus_OBJECTS = radstatus.$(OBJEXT) michael@13: radstatus_OBJECTS = $(am_radstatus_OBJECTS) michael@13: radstatus_LDADD = $(LDADD) michael@13: -radstatus_DEPENDENCIES = ../lib/libradiusclient-ng.la michael@13: +radstatus_DEPENDENCIES = ../lib/libradiusclient.la michael@13: DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ michael@13: depcomp = $(SHELL) $(top_srcdir)/depcomp michael@13: am__depfiles_maybe = depfiles michael@13: @@ -221,7 +221,7 @@ michael@13: top_srcdir = @top_srcdir@ michael@13: AUTOMAKE_OPTIONS = foreign michael@13: INCLUDES = -I$(srcdir) -I$(top_srcdir)/include -I$(top_builddir) michael@13: -LDADD = ../lib/libradiusclient-ng.la michael@13: +LDADD = ../lib/libradiusclient.la michael@13: CLEANFILES = *~ michael@13: noinst_HEADERS = radlogin.h michael@13: radlogin_SOURCES = radlogin.c radius.c local.c michael@18: Index: etc/Makefile.in michael@18: --- etc/Makefile.in.orig 2008-02-24 01:04:31.031421286 +0100 michael@18: +++ etc/Makefile.in 2008-02-24 01:04:38.951886176 +0100 michael@18: @@ -382,6 +382,7 @@ michael@18: radiusclient.conf: radiusclient.conf.in michael@18: sed -e 's|@sbin''dir@|$(sbindir)|g' \ michael@18: -e 's|@pkgsysconf''dir@|$(pkgsysconfdir)|g' \ michael@18: + -e 's|@localstate''dir@|$(localstatedir)/radiusclient|g' \ michael@18: <$(srcdir)/radiusclient.conf.in >radiusclient.conf michael@18: michael@18: install-data-local: servers michael@18: Index: etc/radiusclient.conf.in michael@18: --- etc/radiusclient.conf.in.orig 2008-02-24 00:54:01.643791239 +0100 michael@18: +++ etc/radiusclient.conf.in 2008-02-24 00:55:07.378684108 +0100 michael@18: @@ -54,7 +54,7 @@ michael@18: michael@18: # file which holds sequence number for communication with the michael@18: # RADIUS server michael@18: -seqfile /var/run/radius.seq michael@18: +seqfile @localstatedir@/radius.seq michael@18: michael@18: # file which specifies mapping between ttyname and NAS-Port attribute michael@18: mapfile @pkgsysconfdir@/port-id-map