applied Tim's patch to fix the infinite loop problem and added new web root parameter

lam-packaging/autoconf/Makefile.in

@@ -20,11 +20,12 @@ TAR = @TAR@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 sbindir=@sbindir@
-datarootdir = @datarootdir@
+datarootdir=@datarootdir@
 sysconfdir=@sysconfdir@
 localstatedir=@localstatedir@
 mandir=@mandir@
 htmldir=@prefix@/html
+web_root=@WEB_ROOT@
 
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
@@ -34,9 +35,9 @@ top_builddir = .
 HTTPD_USER = @HTTPD_USER@
 HTTPD_GROUP = @HTTPD_GROUP@
 
-DOCS = COPYING HISTORY README copyright
+DOCS = COPYING HISTORY README copyright docs/schema/dhcp.schema
 
-HTML_DOCS = docs
+HTML_DOCS = devel manual
 
 LIST1 = graphics help index.html lib locale style templates VERSION
 LIST2 = sess tmp
@@ -52,11 +53,13 @@ install-lam:
 	@HERE=`pwd` ; \
 	[ -d $(DESTDIR)$(prefix) ]  ||  \
 		$(MKDIR) -p $(DESTDIR)$(prefix)  ||  exit 1 ; \
+	[ -d $(DESTDIR)$(web_root) ]  ||  \
+		$(MKDIR) -p $(DESTDIR)$(web_root)  ||  exit 1 ; \
 	[ -d $(DESTDIR)$(localstatedir) ]  ||  \
 		$(MKDIR) -p $(DESTDIR)$(localstatedir)  ||  exit 1 ; \
 	[ -d $(DESTDIR)$(sysconfdir) ]  ||  \
 		$(MKDIR) -p $(DESTDIR)$(sysconfdir)  ||  exit 1 ; \
-	cd $(DESTDIR)$(prefix)  ||  exit 1 ; \
+	cd $(DESTDIR)$(web_root)  ||  exit 1 ; \
 	for i in $(LIST2) ; do \
 		[ -d $(DESTDIR)$(localstatedir)/$${i} ]  ||  \
 		    $(MKDIR) -p $(DESTDIR)$(localstatedir)/$${i}  ||  exit 1 ; \
@@ -74,8 +77,7 @@ install-lam:
 		$(MKDIR) -p $(DESTDIR)$(prefix)/docs  ||  exit 1 ; \
 	(cd $(srcdir) ; $(COPY) $(DOCS) $(DESTDIR)$(prefix)/docs) ; \
 	$(PERL) -pi -e "s~/usr/bin/perl~$(PERL)~" \
-		$(DESTDIR)$(prefix)/lib/lamdaemon.pl \
-		$(DESTDIR)$(prefix)/docs/README.lamdaemon.txt ; \
+		$(DESTDIR)$(web_root)/lib/lamdaemon.pl ; \
 	cd $${HERE} ; \
 	echo "LAM files installed" ; \
 	if [ `$(ID) -u` = 0 ] ; then \
@@ -112,7 +114,7 @@ echo-chown:
 install-htdocs:
 	@[ -d $(DESTDIR)$(htmldir) ]  ||  \
 		$(MKDIR) -p $(DESTDIR)$(htmldir)  ||  exit 1 ; \
-	(cd $(srcdir)/$(HTML_DOCS) ; $(TAR) cf - .) | \
+	(cd $(srcdir)/docs ; $(TAR) cf - $(HTML_DOCS)) | \
 		(cd $(DESTDIR)$(htmldir) ; $(TAR) xf -) ; \
 	echo "HTML docs installed in $(htmldir)"
 

lam-packaging/autoconf/configure.ac

@@ -5,25 +5,34 @@
 #
 # $Id$
 #
-# Copyright (c) 2005, 2006 Tim Rice
+# Copyright (c) 2005, 2006, 2010 Tim Rice
 #
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
 #
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+#
+#The complete license can be found in the file COPYING.
 
 AC_PREREQ(2.53)
 AC_INIT(ldap-account-manager, @@VERSION@@, lam-public@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(README)
 AC_PREFIX_DEFAULT(/usr/local/lam)
 
+# work around those that want to build in srcdir
+if test x$srcdir = "x." ; then
+	srcdir=`pwd`
+fi
+
 # Does make set variable $(MAKE)
 AC_PROG_MAKE_SET
 
@@ -80,6 +89,20 @@ AC_ARG_WITH(httpd-group,
 )
 AC_SUBST(HTTPD_GROUP)
 
+WEB_ROOT=${prefix}
+AC_ARG_WITH(web-root,
+    [  --with-web-root=PATH	Specify where the LAM files that the web server
+			uses should be installed.
+			default is ${prefix}	],
+    [
+		if test -n "$withval"  &&  test "x$withval" != "xno"  &&  \
+		    test "x${withval}" != "xyes"; then
+			WEB_ROOT=$withval
+		fi
+    ]
+)
+AC_SUBST(WEB_ROOT)
+
 AC_ARG_WITH(perl,
 	[  --with-perl=PATH       Specify path to perl program ],
 	[