diff -r 30113bfbe723 -r b3afb9f1e801 cgi/Makefile.in
--- a/cgi/Makefile.in	Sun Jan 20 00:12:17 2008 +0100
+++ b/cgi/Makefile.in	Sun Jan 20 00:22:09 2008 +0100
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4a from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -46,10 +46,9 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -58,12 +57,15 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
 CC = @CC@
-CDBPROGS = @CDBPROGS@
-CDBSCRIPTS = @CDBSCRIPTS@
 CXX = @CXX@
+HAVE_LIB = @HAVE_LIB@
 HTML2TXT = @HTML2TXT@
+LIB = @LIB@
 LN = @LN@
+LTLIB = @LTLIB@
 LYNX = @LYNX@
 MAKEINFO = @MAKEINFO@
 MKDIR = @MKDIR@
@@ -86,7 +88,6 @@
 cgi_PROGRAMS = vpasswd vadduser vdeluser vaddalias vchattr vchforwards 	listvdomain
 
 
-CXXLINK = $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@
 INCLUDES = -I../lib
 
 vpasswd_SOURCES = vpasswd.cc
@@ -143,12 +144,13 @@
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  Makefile.am Makefile.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(vpasswd_SOURCES) $(vadduser_SOURCES) $(vdeluser_SOURCES) $(vaddalias_SOURCES) $(vchattr_SOURCES) $(vchforwards_SOURCES) $(listvdomain_SOURCES)
 OBJECTS = $(vpasswd_OBJECTS) $(vadduser_OBJECTS) $(vdeluser_OBJECTS) $(vaddalias_OBJECTS) $(vchattr_OBJECTS) $(vchforwards_OBJECTS) $(listvdomain_OBJECTS)
@@ -178,8 +180,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(cgidir)
 	@list='$(cgi_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(cgidir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(cgidir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgidir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(cgidir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -302,14 +304,6 @@
 	../lib/cgi/cgi-args.h ../lib/misc/server.h \
 	../lib/misc/response.h ../lib/config/configrc.h \
 	../lib/misc/strlist.h
-vchalias.o: vchalias.cc ../config.h ../lib/cgi/cgi-base.h \
-	../lib/mystring/mystring.h ../lib/mystring/rep.h \
-	../lib/mystring/iter.h ../lib/mystring/join.h \
-	../lib/cgi/cgi-args.h ../lib/misc/server.h \
-	../lib/misc/response.h ../lib/config/configrc.h \
-	../lib/misc/strlist.h ../lib/vdomain/vdomain.h \
-	../lib/misc/pwentry.h ../lib/vpwtable/vpwtable.h \
-	../lib/vpwentry/vpwentry.h ../lib/misc/itoa.h
 vchattr.o: vchattr.cc ../config.h ../lib/cgi/cgi-base.h \
 	../lib/mystring/mystring.h ../lib/mystring/rep.h \
 	../lib/mystring/iter.h ../lib/mystring/join.h \
@@ -363,7 +357,7 @@
 all-am: Makefile $(PROGRAMS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(cgidir)