[vhffs] autotools on #542

[Alexandre Ghisoli <alexandre.ghisoli@xxxxxxx>]

Hello, 

New version of the patch, here is the ChangeLog :

. apply on svn #542

. added tests. To use them, do :
  make check

. better handle of --with-api-dir
  use : --with-api-dir=/usr/share/vhffs/api
  and you will get files in /usr/share/vhffs/api/Vhffs 
  and use lib '/usr/share/vhffs/api';

. corrected typos on VHFFS_LIB_DIR in multiple place

. Added --with-min-uid and --with-min-gid

. typo on vhffs-test-dependencies corrected

. NEWS is not blank anymore, let diff create this file

You can download if from : 
http://www.ghisoli.ch/run/node/38

Regards

--Alexandre

diff -Nru vhffs-542-nosvn/bootstrap.sh vhffs-agh/bootstrap.sh
--- vhffs-542-nosvn/bootstrap.sh	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/bootstrap.sh	2007-03-28 19:33:14.000000000 +0200
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -x
+aclocal
+automake --add-missing --copy
+autoconf 	
diff -Nru vhffs-542-nosvn/Changelog vhffs-agh/Changelog
--- vhffs-542-nosvn/Changelog	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/Changelog	1970-01-01 01:00:00.000000000 +0100
@@ -1,177 +0,0 @@
-VHFFS 4.0-pre1
-	Julien:
-	 	- New installer, use now a Makefile
-		- Fix some bugs
-		- Fix a BIG security problem around listengine
-		- checkpackages is fixed
-		- print an error when adatabase connection is not sane
-		- print error when the panel has a problem
-		- svn help use customisable in the vhffs.conf file
-		
-	Christophe Benz:
-		- Fix svn/create/pl string
-		- Fix alert.pl string
-		- Fix intl
-
-
-VHFFS RC10
-	Julien:
-		- Add nospam and novirus directive
-		- Support for anti-spam and anti-virus ( /!\ data definition changes )
-		- Improve build script
-		- Add some tools in vhffs-tools
-		- Modify MailUser to support nospam and novirus directive
-		- Fix bots bugs
-		- Bots uses now lockfiles
-		- Bots now logs error on /var/log/vhffs.log
-		- Begin to release Jabber driver for VHFFS
-		- Add vhffs-modobot (an IRC bot that refuse/accept request on platform
-		  on IRC with chat messages)
-		- Bugfixes on API
-		- Bugfixes on Panel
-		- Bugfixes on bot
-		- Fix MAJOR bug on ACL
-		- Fix bug in parse_httplog robot
-		- Add language support in archives for listengine
-		- Fix bug in postgres/dns admin menu
-		- Add preferences for largefile
-		- Can now view largefile preferences
-		- Can now delete a largefile in the panel
-		- ACL for largefile now works
-		- Admin for largefile works now
-		- Largefile search now works
-		- Moderators can list largefile objects
-		- Add perldoc documentation
-		- Robots uses lockfile only if use_logging are set to "yes" in config
-		  file and lockfile is defined.
-		- Robots use log only if use_logging is set to "yes" in config file
-		  and logfile is defined
-		- Improve install script : vhffs should work on all *nix which runs
-		  perl
-		- Add largefile logo
-		- Update some logos and images for panel
-		- Users and groups can upload avatar (stored in DATADIR/avatar)
-		- Rewrite some public templates
-		- Modify the css file for default
-		- Rewrite the design of the default theme
-		- Create Vhffs::Panel::Avatar perl-module to handle avatars
-		- getavatar.pl page to get avatar for a given object-id
-		- Add show/hide on panel for some menus
-		- In admin, groups for a user is now in a list context, more clean
-		  than lines with <br/> (more standard-compliant)
-		- Admin can now delete avatars for an object (in object admin)
-		- Add use_avatar directive in config file
-		- Add the open directive in the config file
-		- The panel can be closed properly to perform maintainance operations
-		- Add icons for largefile admin menu
-		- Add a robot which collect the used quota
-		- Add a new graphic image which prints the quota for the group
-		- Add perldoc documentation for Vhffs::Panel::Avatar
-		- Add perldoc documentation for Vhffs::Note
-		- Rewrite a part of vhffs-robots, lock and log only if ask in
-		  vhffs.conf
-		- Mailing robot does not send utf-8 messages to hosted
-
-
-
-
-VHFFS RC3
-	Julien:
-	    - add blanked passwords for MySQL (adding security)
-		- add support to change password for mysql
-		- print if a mysql database is under modification in the panel
-		- fix a owner_uid bug in User.pm
-		- cant create now a database which contains the '-' car
-		- add ACL support form Mail Object in the panel
-		- admin can change password of a user now
-		- add delete for mail
-		- enlarge textbox for description in groups
-		- Add support for is_empty in group ( if( $group->is_empty == 1 ) )
-		- Add support for removing union user_group
-		- Fix some MySQL robots in some case
-		- change MySQL passwords. Accept only alphanumeric caracters
-		- fix password for mail, don't use any clear passwd now
-		- finish treat_refused robot
-		- add robot to delete all group
-		- a group must be empty to be delete
-		- send now a mail when an object is moderated
-		- fix barbie theme
-		- fix britney theme
-		- fix Postgres service
-		- add modify_pgsql robot
-		- clean acl code
-		- clean some User code
-		- fix web deletion
-		- begin debian packaging
-		- add description in public area for groups
-		- fix for langages. Now, langages are stored in the preferences of each user in the database
-		- update SVN, fix password, use now encrypted passwd
-		- Sort mail boxes now in mail preferences
-		- Add group in list mail admin
-		- Add list admin
-		- Made phpmyadmin, phppgadmin and stats links not static
-		- Fix a STUPID BUG in admin/user which deny users update
-
-VHFFS RC-2
-	Julien:
-		- add listengine support in panel
-		- fix some robots
-		- fix bug in Object.pm, deny commit when a strange description is set
-		- add functinnality : add admin for dns object 
-		- add some fonctionnalities in stats (dns, cvs, svn, mysql, pgsql  and mail)
-		- Add admin part for subversion
-		- fix some templates calls. Use now
-		  $vhffs->get_config->get_templatedir to get the template directory
-		  according to the configuration file
-		- add admin part for objects (general admin for all objects of Vhffs)
-		- add subversion repository search
-		- add object search in admin part
-		- add admin parts (can commit) for object
-		- add a history link in the menu
-		- add a history menu in the admin object part
-		- add Barbie Theme
-		- add Britney Theme
-		- add support for new Service MailUser which allow a user to manage a
-		  main hosted by directly by VHFFS
-		- add support for MailUser and popboxes
-		- add support for MailUser and forward
-		- add option to delete a User
-		- fix bugs in Vhffs::Panel::Main : a user cannot log in or browse
-		  panel when he is not activated or being deleted
-		- add script to package a cleany full distro of vhffs
-		- add public user profile (
-		  http://panel.vhffs.org/public/user.pl?name=soda )
-		- add public group infos( 
-		   http://panel.vhffs.org/public/group.pl?name=prout )
-		- add public last users and last groups
-		- add RSS files to communicate with others website
-		- change create_group.sql to be compliant with libnss-pgsql
-		- modify Group.pm to be compliant with libnss-pgsql
-		- modify the database to be compliant with myDNS
-		- make myDNS configurations
-		- rewrite 45% of Panel::DNS Services::DNS and Robots::DNS to be
-		  compliant with the new database
-		- add support for NS type for DNS in the Panel
-		- secure remove and adding for DNS in the API
-		- add defaults adding in the DNS. The hoster can define defaults
-		  parameters for hosted domain
-	
-	Sylvain:
-		- implements themes and language
-
-	Florent:
-		- Add some gettext support
-		- Fix a bug like buffer overflow when login
-		- Making create_failed template and changing subscribe_complete.pl to
-		use it (closing bug #0000006)
-		- fix a lot of templates calls
-		- update logo.png on crystal and dark themes
-		- create tuxfamily theme
-		- fix a bug on mysql, pgsql and svn password-length check ("<= 3" instead of "< 3")
-
-	Alexandre
-		- Convert all templates to XHTML (see bug 67 to view avancement...)
----------
-
-VHFFS RC-1
-	- Initial Release
diff -Nru vhffs-542-nosvn/ChangeLog vhffs-agh/ChangeLog
--- vhffs-542-nosvn/ChangeLog	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/ChangeLog	2007-03-28 19:33:14.000000000 +0200
@@ -0,0 +1,177 @@
+VHFFS 4.0-pre1
+	Julien:
+	 	- New installer, use now a Makefile
+		- Fix some bugs
+		- Fix a BIG security problem around listengine
+		- checkpackages is fixed
+		- print an error when adatabase connection is not sane
+		- print error when the panel has a problem
+		- svn help use customisable in the vhffs.conf file
+		
+	Christophe Benz:
+		- Fix svn/create/pl string
+		- Fix alert.pl string
+		- Fix intl
+
+
+VHFFS RC10
+	Julien:
+		- Add nospam and novirus directive
+		- Support for anti-spam and anti-virus ( /!\ data definition changes )
+		- Improve build script
+		- Add some tools in vhffs-tools
+		- Modify MailUser to support nospam and novirus directive
+		- Fix bots bugs
+		- Bots uses now lockfiles
+		- Bots now logs error on /var/log/vhffs.log
+		- Begin to release Jabber driver for VHFFS
+		- Add vhffs-modobot (an IRC bot that refuse/accept request on platform
+		  on IRC with chat messages)
+		- Bugfixes on API
+		- Bugfixes on Panel
+		- Bugfixes on bot
+		- Fix MAJOR bug on ACL
+		- Fix bug in parse_httplog robot
+		- Add language support in archives for listengine
+		- Fix bug in postgres/dns admin menu
+		- Add preferences for largefile
+		- Can now view largefile preferences
+		- Can now delete a largefile in the panel
+		- ACL for largefile now works
+		- Admin for largefile works now
+		- Largefile search now works
+		- Moderators can list largefile objects
+		- Add perldoc documentation
+		- Robots uses lockfile only if use_logging are set to "yes" in config
+		  file and lockfile is defined.
+		- Robots use log only if use_logging is set to "yes" in config file
+		  and logfile is defined
+		- Improve install script : vhffs should work on all *nix which runs
+		  perl
+		- Add largefile logo
+		- Update some logos and images for panel
+		- Users and groups can upload avatar (stored in DATADIR/avatar)
+		- Rewrite some public templates
+		- Modify the css file for default
+		- Rewrite the design of the default theme
+		- Create Vhffs::Panel::Avatar perl-module to handle avatars
+		- getavatar.pl page to get avatar for a given object-id
+		- Add show/hide on panel for some menus
+		- In admin, groups for a user is now in a list context, more clean
+		  than lines with <br/> (more standard-compliant)
+		- Admin can now delete avatars for an object (in object admin)
+		- Add use_avatar directive in config file
+		- Add the open directive in the config file
+		- The panel can be closed properly to perform maintainance operations
+		- Add icons for largefile admin menu
+		- Add a robot which collect the used quota
+		- Add a new graphic image which prints the quota for the group
+		- Add perldoc documentation for Vhffs::Panel::Avatar
+		- Add perldoc documentation for Vhffs::Note
+		- Rewrite a part of vhffs-robots, lock and log only if ask in
+		  vhffs.conf
+		- Mailing robot does not send utf-8 messages to hosted
+
+
+
+
+VHFFS RC3
+	Julien:
+	    - add blanked passwords for MySQL (adding security)
+		- add support to change password for mysql
+		- print if a mysql database is under modification in the panel
+		- fix a owner_uid bug in User.pm
+		- cant create now a database which contains the '-' car
+		- add ACL support form Mail Object in the panel
+		- admin can change password of a user now
+		- add delete for mail
+		- enlarge textbox for description in groups
+		- Add support for is_empty in group ( if( $group->is_empty == 1 ) )
+		- Add support for removing union user_group
+		- Fix some MySQL robots in some case
+		- change MySQL passwords. Accept only alphanumeric caracters
+		- fix password for mail, don't use any clear passwd now
+		- finish treat_refused robot
+		- add robot to delete all group
+		- a group must be empty to be delete
+		- send now a mail when an object is moderated
+		- fix barbie theme
+		- fix britney theme
+		- fix Postgres service
+		- add modify_pgsql robot
+		- clean acl code
+		- clean some User code
+		- fix web deletion
+		- begin debian packaging
+		- add description in public area for groups
+		- fix for langages. Now, langages are stored in the preferences of each user in the database
+		- update SVN, fix password, use now encrypted passwd
+		- Sort mail boxes now in mail preferences
+		- Add group in list mail admin
+		- Add list admin
+		- Made phpmyadmin, phppgadmin and stats links not static
+		- Fix a STUPID BUG in admin/user which deny users update
+
+VHFFS RC-2
+	Julien:
+		- add listengine support in panel
+		- fix some robots
+		- fix bug in Object.pm, deny commit when a strange description is set
+		- add functinnality : add admin for dns object 
+		- add some fonctionnalities in stats (dns, cvs, svn, mysql, pgsql  and mail)
+		- Add admin part for subversion
+		- fix some templates calls. Use now
+		  $vhffs->get_config->get_templatedir to get the template directory
+		  according to the configuration file
+		- add admin part for objects (general admin for all objects of Vhffs)
+		- add subversion repository search
+		- add object search in admin part
+		- add admin parts (can commit) for object
+		- add a history link in the menu
+		- add a history menu in the admin object part
+		- add Barbie Theme
+		- add Britney Theme
+		- add support for new Service MailUser which allow a user to manage a
+		  main hosted by directly by VHFFS
+		- add support for MailUser and popboxes
+		- add support for MailUser and forward
+		- add option to delete a User
+		- fix bugs in Vhffs::Panel::Main : a user cannot log in or browse
+		  panel when he is not activated or being deleted
+		- add script to package a cleany full distro of vhffs
+		- add public user profile (
+		  http://panel.vhffs.org/public/user.pl?name=soda )
+		- add public group infos( 
+		   http://panel.vhffs.org/public/group.pl?name=prout )
+		- add public last users and last groups
+		- add RSS files to communicate with others website
+		- change create_group.sql to be compliant with libnss-pgsql
+		- modify Group.pm to be compliant with libnss-pgsql
+		- modify the database to be compliant with myDNS
+		- make myDNS configurations
+		- rewrite 45% of Panel::DNS Services::DNS and Robots::DNS to be
+		  compliant with the new database
+		- add support for NS type for DNS in the Panel
+		- secure remove and adding for DNS in the API
+		- add defaults adding in the DNS. The hoster can define defaults
+		  parameters for hosted domain
+	
+	Sylvain:
+		- implements themes and language
+
+	Florent:
+		- Add some gettext support
+		- Fix a bug like buffer overflow when login
+		- Making create_failed template and changing subscribe_complete.pl to
+		use it (closing bug #0000006)
+		- fix a lot of templates calls
+		- update logo.png on crystal and dark themes
+		- create tuxfamily theme
+		- fix a bug on mysql, pgsql and svn password-length check ("<= 3" instead of "< 3")
+
+	Alexandre
+		- Convert all templates to XHTML (see bug 67 to view avancement...)
+---------
+
+VHFFS RC-1
+	- Initial Release
diff -Nru vhffs-542-nosvn/configure.ac vhffs-agh/configure.ac
--- vhffs-542-nosvn/configure.ac	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/configure.ac	2007-04-06 18:32:52.000000000 +0200
@@ -0,0 +1,212 @@
+AC_REVISION($Revision: 93 $)dnl
+AC_INIT(vhffs, [4.1-trunk], [support@xxxxxxxxx])
+
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_SED
+AC_PREFIX_DEFAULT([/usr])
+
+AC_PATH_PROG([PERL], [perl], [not found])
+if test "$PERL" = 'not found'; then
+	AC_MSG_ERROR([perl is needed to run $PACKAGE_NAME])
+fi
+
+AM_INIT_AUTOMAKE([no-define no-define dist-bzip2])
+
+
+# --- Specific path
+dnl Where to store configuration files
+AC_ARG_WITH(conf-path,
+	AC_HELP_STRING([--with-conf-path=path],
+		[Complete path for configuration files (/etc/vhffs)]),
+	CONFDIR=$withval,
+	CONFDIR=/etc/vhffs
+)
+AC_SUBST(CONFDIR)
+
+AC_ARG_WITH(shell-path,
+	AC_HELP_STRING([--with-shell-path=path],
+		[Complete path for tux shell (/bin)]),
+	SHELLDIR=$withval,
+	SHELLDIR=/usr/bin
+)
+AC_SUBST(SHELLDIR)
+
+dnl Where to store configuration files
+AC_ARG_WITH(tools-path,
+	AC_HELP_STRING([--with-tools-path=path],
+		[Complete path for tools (executables) (/usr/local/bin)]),
+	TOOLSDIR=$withval,
+	TOOLSDIR=/usr/local/bin
+)
+AC_SUBST(TOOLSDIR)
+
+dnl Documentation
+AC_ARG_WITH(doc-path,
+	AC_HELP_STRING([--with-doc-path=path],
+		[Complete path for documentation files (/usr/share/doc/vhffs)]),
+	DOCDIR=$withval,
+	DOCDIR=/usr/share/doc/vhffs
+)
+AC_SUBST(DOCDIR)
+
+dnl perl modules
+AC_ARG_WITH(api-path,
+	AC_HELP_STRING([--with-api-path=path],
+		[Path for perl modules (API) (/usr/share/vhffs/api)]),
+	VHFFS_LIBDIR=$(withval),
+	VHFFS_LIBDIR=/usr/share/vhffs/api
+)
+APIDIR=$VHFFS_LIBDIR/Vhffs
+AC_SUBST(APIDIR)
+AC_SUBST(VHFFS_LIBDIR)
+
+dnl web panel
+AC_ARG_WITH(web-path,
+	AC_HELP_STRING([--with-web-path=path],
+		[Complete path for web interface (panel) (/usr/share/vhffs/panel)]),
+	PANELDIR=$withval,
+	PANELDIR=/usr/share/vhffs/panel
+)
+AC_SUBST(PANELDIR)
+
+dnl templates
+AC_ARG_WITH(web-path,
+	AC_HELP_STRING([--with-template-path=path],
+		[Complete path for web templates (panel) (/usr/share/vhffs/templates)]),
+	TEMPLATESDIR=$withval,
+	TEMPLATESDIR=/usr/share/vhffs/panel
+)
+AC_SUBST(TEMPLATESDIR)
+
+AC_ARG_WITH(backend-path,
+	AC_HELP_STRING([--with-backend-path=path],
+		[Complete path for web backend (/usr/share/vhffs/backend)]),
+	BACKENDDIR=$withval,
+	BACKENDDIR=/usr/share/vhffs/backend
+)
+AC_SUBST(BACKENDDIR)
+
+dnl Bots path
+AC_ARG_WITH(robot-path,
+	AC_HELP_STRING([--with-robot-path=path],
+		[Complete path for robots file (/usr/lib/vhffs/bots)]),
+	BOTSDIR=$withval,
+	BOTSDIR=/usr/lib/vhffs/bots
+)
+AC_SUBST(BOTSDIR)
+
+dnl jabber pipe
+AC_ARG_WITH(jabber-path,
+	AC_HELP_STRING([--with-jabber-path=path],
+		[Complete path for jabber pipe (/usr/share/vhffs/jabber)]),
+	JABBERDIR=$withval,
+	JABBERDIR=/usr/share/vhffs/jabber
+)
+AC_SUBST(JABBERDIR)
+
+dnl Listengine
+AC_ARG_WITH(listengine-path,
+	AC_HELP_STRING([--with-listengine-path=path],
+		[Complete path for jabber pipe (/usr/lib/vhffs/listengine)]),
+	LEDIR=$withval,
+	LEDIR=/usr/lib/vhffs/listengine
+)
+AC_SUBST(LEDIR)
+
+dnl Listengine web files
+AC_ARG_WITH(listengine-web-path,
+	AC_HELP_STRING([--with-listengine-web-path=path],
+		[Complete path for listengine web file (/usr/share/vhffs/listengine)]),
+	LEWEB=$withval,
+	LEWEB=/usr/lib/vhffs/listengine
+)
+AC_SUBST(LEWEB)
+
+dnl Mail
+AC_ARG_WITH(mail-path,
+	AC_HELP_STRING([--with-mail-path=path],
+		[Complete path for email files (/usr/share/vhffs/mails)]),
+	MAILSDIR=$withval,
+	MAILSDIR=/usr/lib/vhffs/listengine
+)
+AC_SUBST(MAILSDIR)
+
+dnl documentation
+AC_ARG_WITH(doc-path,
+	AC_HELP_STRING([--with-doc-path=path],
+		[Complete path for documentation files (/usr/share/vhffs/mails)]),
+	DOCSDIR=$withval,
+	DOCSDIR=/usr/docs/
+)
+AC_SUBST(DOCSDIR)
+
+dnl setup min uid and gid
+AC_ARG_WITH(min-uid,
+	AC_HELP_STRING([--with-min-uid=uid],
+		[What is the minimal UID for VHFFS users (10000)]),
+	MINUID=$withval,
+	MINUID=10000
+)
+AC_SUBST(MINUID)
+
+AC_ARG_WITH(min-gid,
+	AC_HELP_STRING([--with-min-gid=gid],
+		[What is the minimal GID for VHFFS groups (10000)]),
+	MINGID=$withval,
+	MINGID=10000
+)
+AC_SUBST(MINGID)
+
+
+# -- Starting system checks
+AC_CHECK_HEADERS([stdlib.h string.h sys/time.h syslog.h unistd.h])
+
+# Needed for tuxshell
+AC_CONFIG_SRCDIR([vhffs-shells/tuxshell.c])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_TIME
+AC_HEADER_STDBOOL
+AC_TYPE_UID_T
+
+# Checks for library functions.
+AC_FUNC_CLOSEDIR_VOID
+AC_FUNC_FORK
+AC_CHECK_FUNCS([gettimeofday])
+
+
+# -- Files to generate
+AC_CONFIG_FILES([
+	vhffs-test-dependencies],
+	[chmod ug+x $ac_file]
+)
+
+AC_CONFIG_FILES([
+	vhffs-compat/4.0.sql
+	vhffs-backend/src/pgsql/initdb.sql
+	vhffs-backend/conf/vhffs.conf])
+
+AC_CONFIG_FILES([
+	Makefile
+	vhffs-api/Makefile
+	vhffs-api/src/Makefile
+	vhffs-api/src/Vhffs/Makefile
+	vhffs-backend/Makefile
+	vhffs-doc/Makefile
+	vhffs-jabber/Makefile
+	vhffs-listengine/Makefile
+	vhffs-listengine/src/Makefile
+	vhffs-listengine/src/archives/Makefile
+	vhffs-panel/Makefile
+	vhffs-robots/Makefile
+	vhffs-shells/Makefile
+	vhffs-tests/Makefile
+	vhffs-tests/src/Makefile
+	vhffs-tools/Makefile
+	vhffs-tools/src/Makefile
+	],
+)
+
+AC_OUTPUT
\ Pas de fin de ligne à la fin du fichier.
diff -Nru vhffs-542-nosvn/Makefile vhffs-agh/Makefile
--- vhffs-542-nosvn/Makefile	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,323 +0,0 @@
-#!/usr/bin/make
-
-CONFDIR      = $(DESTDIR)/etc/vhffs
-DOCDIR       = $(DESTDIR)/usr/share/doc/vhffs
-APIDIR       = $(DESTDIR)/usr/share/vhffs/api/Vhffs
-PANELDIR     = $(DESTDIR)/usr/share/vhffs/panel
-TEMPLATESDIR = $(DESTDIR)/usr/share/vhffs/templates
-BACKENDDIR   = $(DESTDIR)/usr/share/vhffs/backend
-INTLDIR      = $(DESTDIR)/usr/share/vhffs/intl
-BOTSDIR      = $(DESTDIR)/usr/lib/vhffs/bots
-LEDIR        = $(DESTDIR)/usr/lib/vhffs/listengine
-TOOLSDIR     = $(DESTDIR)/usr/bin
-SHELLDIR     = $(DESTDIR)/usr/bin
-JABBERDIR    = $(DESTDIR)/usr/share/vhffs/jabber
-LEWEB        = $(DESTDIR)/usr/share/vhffs/listengine
-MAILSDIR     = $(DESTDIR)/usr/share/vhffs/mails
-
-PERL_MODULES=HTML::Template Digest::MD5 CGI Locale::gettext Config::General DBI Email::Valid Crypt::PasswdMD5 GD::Text::Wrap GD MIME::Lite XML::RSS CGI::Session Encode utf8 LockFile::Simple  Mail::Internet Email::Valid Time::ParseDate Quota
-DEBIAN_PACKAGES=gcc libxml-rss-perl liblocale-gettext-perl libconfig-general-perl libhtml-template-perl libcrypt-passwdmd5-perl libgd-text-perl libmime-lite-perl libcgi-session-perl liblockfile-simple-perl libgd-gd2-perl libclass-dbi-pg-perl libclass-dbi-perl libdbd-pg-perl libemail-valid-perl libc6-dev libtime-modules-perl libquota-perl
-
-all: help
-
-install: update-version install-api install-panel install-listengine install-tools install-intl install-conf install-backend install-doc install-bots install-shell install-jabber 
-
-install-debian: update-version debian-deps install-api install-panel install-listengine install-tools install-intl install-conf install-backend install-doc install-bots install-shell install-jabber
-
-check: test-deps
-
-help:
-	#Help for VHFFS makefile
-	#make help - display this help
-	#make install - install VHFFS on this host
-	#make install-debian - install VHFFS on this host and debian-dependencies. Use with debian-based systems
-	#make debian-deps - install debian-dependencies
-	#make test-deps - test if all dependencies are installed
-
-debian-deps:
-	/usr/bin/apt-get install $(DEBIAN_PACKAGES)
-
-
-update-version:
-	@svnversion . | perl -e " \
-		\$$_ = <STDIN>; \
-		/^(?:.*?:)?(\d+)\w*\$$/; \
-		my \$$version = \$$1; \
-		\$$^I = \"\"; \
-		while(<>) { \
-			s/(VHFFS_VERSION.*\d+\.\d+.*?)(?:\d+)(.*)/\$$1\$$version\$$2/; \
-			print; \
-		}" vhffs-api/src/Vhffs/Constants.pm
-
-test-deps:
-	@perl -e " \
-		foreach ( qw( $(PERL_MODULES) ) ) { \
-			if( eval \"require \$$_;\" == 0 ) { \
-				print \"\n\n** ERROR ** \$$_ perl-module is not installed\n\n\"; \
-				exit( 1 ); \
-			} \
-		} \
-		print \"Good all perl-deps are installed\n\"; exit( 0 );"
-
-install-shell: build-shell add-shell
-
-build-shell:
-	install -d -m 755 $(SHELLDIR)
-	gcc -Wall -pedantic -o $(SHELLDIR)/tuxshell vhffs-shells/tuxshell.c
-
-add-shell:
-	install -d -m 755 $(DESTDIR)/etc
-	if [ -f $(DESTDIR)/etc/shells ]; then if [ `grep -c "$(SHELLDIR)/tuxshell" $(DESTDIR)/etc/shells` = "0" ]; then echo "$(SHELLDIR)/tuxshell" >> $(DESTDIR)/etc/shells ; fi ; else echo "$(SHELLDIR)/tuxshell" > $(DESTDIR)/etc/shells ; fi
-
-install-bots:
-	install -d -m 755 $(BOTSDIR)	
-	install -d -m 755 $(BOTSDIR)/misc/
-	install -m 755 vhffs-robots/src/*.pl            $(BOTSDIR)/
-	install -m 644 vhffs-robots/misc/*   $(BOTSDIR)/misc/
-
-install-doc:
-	install -d -m 755 $(DOCDIR)	
-	install -d -m 755 $(DOCDIR)/config
-	install -d -m 755 $(DOCDIR)/config/apache
-	install -m 644 vhffs-doc/AUTHORS         $(DOCDIR)/
-	install -m 644 vhffs-doc/CONVENTION-fr   $(DOCDIR)/
-	install -m 644 vhffs-doc/HOWTO*          $(DOCDIR)/
-	install -m 644 vhffs-doc/README*         $(DOCDIR)/
-	install -m 644 vhffs-doc/LICENSE*        $(DOCDIR)/
-	install -m 644 vhffs-doc/config/apache/* $(DOCDIR)/config/apache/
-
-install-conf:
-	install -d -m 755 $(CONFDIR)
-	@if [ ! -f $(CONFDIR)/vhffs.conf ]; then echo "INSTALL ORIGINAL CONFIG FILE" ; install -m 600 vhffs-backend/conf/vhffs.conf $(CONFDIR)/ ; else echo "CONFIG FILE ALREADY EXISTS" ; fi
-
-install-backend:
-	install -d -m 755 $(BACKENDDIR)
-	install -d -m 755 $(MAILSDIR)
-	install -d -m 755 $(BACKENDDIR)/pgsql
-	install -d -m 755 $(BACKENDDIR)/tools
-	install -m 644 vhffs-backend/src/pgsql/*.sql    $(BACKENDDIR)/pgsql/
-#	install -m 755 vhffs-backend/tools/vhffs-initdb $(BACKENDDIR)/tools/vhffs-initdb
-	install -m 644 vhffs-backend/mails/*    $(MAILSDIR)/
-
-install-intl:
-	install -d -m 755 $(INTLDIR)
-	install -d -m 755 $(INTLDIR)/en_US/LC_MESSAGES
-	install -d -m 755 $(INTLDIR)/fr_FR/LC_MESSAGES
-	install -d -m 755 $(INTLDIR)/es_ES/LC_MESSAGES
-	install -m 644 vhffs-intl/result/es_ES/vhffs.mo $(INTLDIR)/es_ES/LC_MESSAGES/
-	install -m 644 vhffs-intl/result/fr_FR/vhffs.mo $(INTLDIR)/fr_FR/LC_MESSAGES/
-
-install-tools:
-	install -d -m 755 $(TOOLSDIR)
-	install -m 755 vhffs-tools/src/vhffs-blankmysql   $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-dumpmysql    $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-checkinstall $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-groupdel     $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-groupinfo    $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-moderate     $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-passwd       $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-quota        $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-userdel      $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-userinfo     $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-usermod      $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-webdir       $(TOOLSDIR)/
-	install -m 755 vhffs-tools/src/vhffs-makeadmin    $(TOOLSDIR)/
-
-
-install-listengine-web:
-	install -d -m 755 $(LEWEB)
-	install -d -m 755 $(LEWEB)/archives
-	install -d -m 755 $(LEWEB)/templates
-	install -d -m 755 $(LEWEB)/misc
-	install -m 755 vhffs-listengine/src/archives/*.pl             $(LEWEB)/archives/
-	install -m 644 vhffs-listengine/src/archives/templates/*.tmpl $(LEWEB)/templates
-	install -m 644 vhffs-listengine/misc/*                        $(LEWEB)/misc
-	if [ ! -L $(LEWEB)/archives/themes ]; then ln -fs $(PANELDIR)/themes $(LEWEB)/archives/themes ; fi
-
-install-listengine: install-listengine-web
-	install -d -m 755 $(LEDIR)
-	install -m 755 vhffs-listengine/src/listengine.pl $(LEDIR)/listengine
-
-install-jabber:
-	install -d -m 755 $(JABBERDIR)
-	install -m 755 vhffs-jabber/*.pl $(JABBERDIR)/
-
-install-api:
-	install -d -m 755 $(APIDIR)/Services
-	install -d -m 755 $(APIDIR)/Robots
-	install -d -m 755 $(APIDIR)/Panel
-	install -d -m 755 $(APIDIR)/Misc
-	install -d -m 755 $(APIDIR)/Listengine
-	install -m 644 vhffs-api/src/Vhffs/*.pm $(APIDIR)/
-	install -m 644 vhffs-api/src/Vhffs/Listengine/*.pm $(APIDIR)/Listengine/
-	install -m 644 vhffs-api/src/Vhffs/Misc/*.pm $(APIDIR)/Misc/
-	install -m 644 vhffs-api/src/Vhffs/Panel/*.pm $(APIDIR)/Panel/
-	install -m 644 vhffs-api/src/Vhffs/Robots/*.pm $(APIDIR)/Robots/
-	install -m 644 vhffs-api/src/Vhffs/Services/*.pm $(APIDIR)/Services/
-
-install-templates:
-	install -d -m 755 $(TEMPLATESDIR)
-	install -d -m 755 $(TEMPLATESDIR)/acl
-	install -d -m 755 $(TEMPLATESDIR)/admin
-	install -d -m 755 $(TEMPLATESDIR)/admin/cvs
-	install -d -m 755 $(TEMPLATESDIR)/admin/dns
-	install -d -m 755 $(TEMPLATESDIR)/admin/group
-	install -d -m 755 $(TEMPLATESDIR)/admin/repository
-	install -d -m 755 $(TEMPLATESDIR)/admin/mail
-	install -d -m 755 $(TEMPLATESDIR)/admin/mailing
-	install -d -m 755 $(TEMPLATESDIR)/admin/main
-	install -d -m 755 $(TEMPLATESDIR)/admin/misc
-	install -d -m 755 $(TEMPLATESDIR)/admin/mysql
-	install -d -m 755 $(TEMPLATESDIR)/admin/object
-	install -d -m 755 $(TEMPLATESDIR)/admin/pgsql
-	install -d -m 755 $(TEMPLATESDIR)/admin/svn
-	install -d -m 755 $(TEMPLATESDIR)/admin/user
-	install -d -m 755 $(TEMPLATESDIR)/admin/web
-	install -d -m 755 $(TEMPLATESDIR)/cvs
-	install -d -m 755 $(TEMPLATESDIR)/dns
-	install -d -m 755 $(TEMPLATESDIR)/group
-	install -d -m 755 $(TEMPLATESDIR)/repository
-	install -d -m 755 $(TEMPLATESDIR)/mail
-	install -d -m 755 $(TEMPLATESDIR)/mailinglist
-	install -d -m 755 $(TEMPLATESDIR)/main
-	install -d -m 755 $(TEMPLATESDIR)/menu
-	install -d -m 755 $(TEMPLATESDIR)/misc
-	install -d -m 755 $(TEMPLATESDIR)/mysql
-	install -d -m 755 $(TEMPLATESDIR)/pgsql
-	install -d -m 755 $(TEMPLATESDIR)/public
-	install -d -m 755 $(TEMPLATESDIR)/public/misc
-	install -d -m 755 $(TEMPLATESDIR)/svn
-	install -d -m 755 $(TEMPLATESDIR)/user
-	install -d -m 755 $(TEMPLATESDIR)/web
-	#install files now
-	install -m 755 vhffs-panel/templates/acl/*.tmpl 			$(TEMPLATESDIR)/acl/
-	install -m 755 vhffs-panel/templates/admin/cvs/*.tmpl 		$(TEMPLATESDIR)/admin/cvs/
-	install -m 755 vhffs-panel/templates/admin/dns/*.tmpl 		$(TEMPLATESDIR)/admin/dns/
-	install -m 755 vhffs-panel/templates/admin/group/*.tmpl 	$(TEMPLATESDIR)/admin/group/
-	install -m 755 vhffs-panel/templates/admin/repository/*.tmpl $(TEMPLATESDIR)/admin/repository/
-	install -m 755 vhffs-panel/templates/admin/mail/*.tmpl 		$(TEMPLATESDIR)/admin/mail/
-	install -m 755 vhffs-panel/templates/admin/mailing/*.tmpl 	$(TEMPLATESDIR)/admin/mailing/
-	install -m 755 vhffs-panel/templates/admin/main/*.tmpl 		$(TEMPLATESDIR)/admin/main/
-	install -m 755 vhffs-panel/templates/admin/misc/*.tmpl 		$(TEMPLATESDIR)/admin/misc/
-	install -m 755 vhffs-panel/templates/admin/mysql/*.tmpl 	$(TEMPLATESDIR)/admin/mysql/
-	install -m 755 vhffs-panel/templates/admin/object/*.tmpl 	$(TEMPLATESDIR)/admin/object/
-	install -m 755 vhffs-panel/templates/admin/pgsql/*.tmpl 	$(TEMPLATESDIR)/admin/pgsql/
-	install -m 755 vhffs-panel/templates/admin/svn/*.tmpl 		$(TEMPLATESDIR)/admin/svn/
-	install -m 755 vhffs-panel/templates/admin/user/*.tmpl 		$(TEMPLATESDIR)/admin/user/
-	install -m 755 vhffs-panel/templates/admin/web/*.tmpl 		$(TEMPLATESDIR)/admin/web/
-	install -m 755 vhffs-panel/templates/cvs/*.tmpl	 			$(TEMPLATESDIR)/cvs/
-	install -m 755 vhffs-panel/templates/dns/*.tmpl 			$(TEMPLATESDIR)/dns/
-	install -m 755 vhffs-panel/templates/group/*.tmpl 			$(TEMPLATESDIR)/group/
-	install -m 755 vhffs-panel/templates/repository/*.tmpl 		$(TEMPLATESDIR)/repository/
-	install -m 755 vhffs-panel/templates/mail/*.tmpl 			$(TEMPLATESDIR)/mail/
-	install -m 755 vhffs-panel/templates/mailinglist/*.tmpl 	$(TEMPLATESDIR)/mailinglist/
-	install -m 755 vhffs-panel/templates/main/*.tmpl 			$(TEMPLATESDIR)/main/
-	install -m 755 vhffs-panel/templates/menu/*.tmpl 			$(TEMPLATESDIR)/menu/
-	install -m 755 vhffs-panel/templates/misc/*.tmpl 			$(TEMPLATESDIR)/misc/
-	install -m 755 vhffs-panel/templates/mysql/*.tmpl 			$(TEMPLATESDIR)/mysql/
-	install -m 755 vhffs-panel/templates/pgsql/*.tmpl 			$(TEMPLATESDIR)/pgsql/
-	install -m 755 vhffs-panel/templates/public/*.tmpl 			$(TEMPLATESDIR)/public/
-	install -m 755 vhffs-panel/templates/public/misc/*.tmpl 	$(TEMPLATESDIR)/public/misc/
-	install -m 755 vhffs-panel/templates/svn/*.tmpl 			$(TEMPLATESDIR)/svn/
-	install -m 755 vhffs-panel/templates/user/*.tmpl 			$(TEMPLATESDIR)/user/
-	install -m 755 vhffs-panel/templates/web/*.tmpl 			$(TEMPLATESDIR)/web/
-
-install-panel: install-templates
-	install -d -m 755 $(PANELDIR)
-	install -d -m 755 $(PANELDIR)/acl
-	install -d -m 755 $(PANELDIR)/admin $(PANELDIR)/admin/cvs $(PANELDIR)/admin/dns $(PANELDIR)/admin/group $(PANELDIR)/admin/repository $(PANELDIR)/admin/mail $(PANELDIR)/admin/mailing $(PANELDIR)/admin/mysql $(PANELDIR)/admin/object $(PANELDIR)/admin/pgsql $(PANELDIR)/admin/svn $(PANELDIR)/admin/user $(PANELDIR)/admin/web
-	install -d -m 755 $(PANELDIR)/cvs
-	install -d -m 755 $(PANELDIR)/dns
-	install -d -m 755 $(PANELDIR)/group
-	install -d -m 755 $(PANELDIR)/help
-	install -d -m 755 $(PANELDIR)/repository
-	install -d -m 755 $(PANELDIR)/mail
-	install -d -m 755 $(PANELDIR)/mailinglist
-	install -d -m 755 $(PANELDIR)/mysql
-	install -d -m 755 $(PANELDIR)/object
-	install -d -m 755 $(PANELDIR)/pgsql
-	install -d -m 755 $(PANELDIR)/public $(PANELDIR)/public/rss
-	install -d -m 755 $(PANELDIR)/svn
-	install -d -m 755 $(PANELDIR)/themes
-	install -d -m 755 $(PANELDIR)/user
-	install -d -m 755 $(PANELDIR)/web
-	#install files
-	install -m 644 vhffs-panel/*.ico                $(PANELDIR)/
-	install -m 755 vhffs-panel/*.pl                 $(PANELDIR)/
-	install -m 755 vhffs-panel/acl/*.pl             $(PANELDIR)/acl/
-	install -m 755 vhffs-panel/admin/*.pl           $(PANELDIR)/admin/
-	install -m 755 vhffs-panel/admin/cvs/*.pl       $(PANELDIR)/admin/cvs/
-	install -m 755 vhffs-panel/admin/dns/*.pl       $(PANELDIR)/admin/dns/
-	install -m 755 vhffs-panel/admin/group/*.pl     $(PANELDIR)/admin/group/
-	install -m 755 vhffs-panel/admin/repository/*.pl $(PANELDIR)/admin/repository/
-	install -m 755 vhffs-panel/admin/mail/*.pl      $(PANELDIR)/admin/mail/
-	install -m 755 vhffs-panel/admin/mailing/*.pl   $(PANELDIR)/admin/mailing/
-	install -m 755 vhffs-panel/admin/mysql/*.pl     $(PANELDIR)/admin/mysql/
-	install -m 755 vhffs-panel/admin/object/*.pl    $(PANELDIR)/admin/object/
-	install -m 755 vhffs-panel/admin/pgsql/*.pl     $(PANELDIR)/admin/pgsql/
-	install -m 755 vhffs-panel/admin/svn/*.pl       $(PANELDIR)/admin/svn/
-	install -m 755 vhffs-panel/admin/user/*.pl      $(PANELDIR)/admin/user/
-	install -m 755 vhffs-panel/admin/web/*.pl       $(PANELDIR)/admin/web/
-	install -m 755 vhffs-panel/cvs/*.pl             $(PANELDIR)/cvs/
-	install -m 755 vhffs-panel/dns/*.pl             $(PANELDIR)/dns/
-	install -m 755 vhffs-panel/group/*.pl           $(PANELDIR)/group/
-	install -m 755 vhffs-panel/help/*.html          $(PANELDIR)/help/
-	install -m 755 vhffs-panel/repository/*.pl      $(PANELDIR)/repository/
-	install -m 755 vhffs-panel/mail/*.pl            $(PANELDIR)/mail/
-	install -m 755 vhffs-panel/mailinglist/*.pl     $(PANELDIR)/mailinglist/
-	install -m 755 vhffs-panel/mysql/*.pl           $(PANELDIR)/mysql/
-	install -m 755 vhffs-panel/object/*.pl          $(PANELDIR)/object/
-	install -m 755 vhffs-panel/pgsql/*.pl           $(PANELDIR)/pgsql/
-	install -m 755 vhffs-panel/public/*.pl          $(PANELDIR)/public/
-	install -m 755 vhffs-panel/public/rss/*.pl      $(PANELDIR)/public/rss/
-	install -m 755 vhffs-panel/svn/*.pl             $(PANELDIR)/svn/
-	install -m 755 vhffs-panel/user/*.pl            $(PANELDIR)/user/
-	install -m 755 vhffs-panel/web/*.pl             $(PANELDIR)/web/
-	#install themes now
-	install -d -m 755 $(PANELDIR)/js
-	install -m 644 vhffs-panel/js/*.js				$(PANELDIR)/js/
-	#default theme
-	install -d -m 755 $(PANELDIR)/themes/vhffs
-	install -d -m 755 $(PANELDIR)/themes/vhffs/images
-	install -d -m 755 $(PANELDIR)/themes/vhffs/js
-	install -m 644 vhffs-panel/themes/vhffs/*.css        $(PANELDIR)/themes/vhffs/
-	install -m 644 vhffs-panel/themes/vhffs/images/*.png $(PANELDIR)/themes/vhffs/images/
-	install -m 644 vhffs-panel/themes/vhffs/js/*.js      $(PANELDIR)/themes/vhffs/js/
-	#next gen theme
-	install -d -m 755 $(PANELDIR)/themes/vhffs-ng
-	install -d -m 755 $(PANELDIR)/themes/vhffs-ng/images
-	install -d -m 755 $(PANELDIR)/themes/vhffs-ng/js
-	install -m 644 vhffs-panel/themes/vhffs-ng/*.css        $(PANELDIR)/themes/vhffs-ng/
-	install -m 644 vhffs-panel/themes/vhffs-ng/images/*.png $(PANELDIR)/themes/vhffs-ng/images/
-	install -m 644 vhffs-panel/themes/vhffs-ng/js/*.js		$(PANELDIR)/themes/vhffs-ng/js/
-
-
-test: test-object test-group test-user test-stats test-svn test-cvs test-web test-dns test-mail test-ml test-mysql test-pgsql test-functions test-repos
-test-object:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Object.pl");'
-test-group:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Group.pl");'
-test-user:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/User.pl");'
-test-stats:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Stats.pl");'
-test-svn:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Services/Svn.pl");'
-test-cvs:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Services/Cvs.pl");'
-test-web:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Services/Httpd.pl");'
-test-dns:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Services/DNS.pl");'
-test-mail:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Services/Mail.pl");'
-test-ml:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Services/Mailing.pl");'
-test-mysql:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Services/Mysql.pl");'
-test-pgsql:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Services/Postgres.pl");'
-test-functions:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Functions.pl");'
-test-repos:
-	@perl -I vhffs-tests/src/ -I vhffs-api/src/ -e 'use Test::Harness; Test::Harness::runtests("vhffs-tests/src/Services/Repository.pl");'
diff -Nru vhffs-542-nosvn/Makefile.am vhffs-agh/Makefile.am
--- vhffs-542-nosvn/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/Makefile.am	2007-04-06 18:14:25.000000000 +0200
@@ -0,0 +1,32 @@
+PERL = @PERL@
+
+SITE_CONFIG_FILE = @CONFDIR@/vhffs.conf
+
+SUBDIRS = vhffs-api vhffs-backend vhffs-doc vhffs-jabber vhffs-listengine \
+	vhffs-panel vhffs-robots vhffs-shells vhffs-tests
+
+EXTRA_DIST = vhffs-compat vhffs-forum vhffs-intl vhffs-irc vhffs-packages \
+	vhffs-rfc vhffs-tests vhffs-tools
+
+help:
+	@echo "Help for VHFFS makefile"
+	@echo " help           display this help"
+	@echo " install        install VHFFS on this host"
+	@echo " test-deps      Verify all dependecies"
+
+post-inst:
+	@echo "Congratulations ! VHFFS is now installed."
+	@echo ""
+	@echo ""
+	@echo "You must now configure vhffs by editing $(SITE_CONFIG_FILE)."
+	@echo ""
+	@echo "Make sure you setup database information, hostname and services"
+
+test-deps:
+	$(PERL) ./vhffs-test-dependencies --verbose --verify=all
+	
+test:
+	$(make) vhffs-tests/
+
+dist-hook:
+	rm -rf `find $(distdir)/ -name '.svn'`
\ Pas de fin de ligne à la fin du fichier.
diff -Nru vhffs-542-nosvn/NEWS vhffs-agh/NEWS
--- vhffs-542-nosvn/NEWS	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/NEWS	2007-04-06 18:32:52.000000000 +0200
@@ -0,0 +1 @@
+VHFFS project
\ Pas de fin de ligne à la fin du fichier.
diff -Nru vhffs-542-nosvn/README vhffs-agh/README
--- vhffs-542-nosvn/README	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/README	2007-03-28 19:33:14.000000000 +0200
@@ -10,3 +10,9 @@
 If you are English and you speak French, you can translate the vhffsbook ;-)
 
 To install VHFFS, try make help in the root
+
+To run autotools, run : 
+
+aclocal
+autoheader
+automake
\ Pas de fin de ligne à la fin du fichier.
diff -Nru vhffs-542-nosvn/vhffs-api/AUTHORS vhffs-agh/vhffs-api/AUTHORS
--- vhffs-542-nosvn/vhffs-api/AUTHORS	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-api/AUTHORS	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-AUTHORS of Vhffs :
-	- Julien Delange (soda)
diff -Nru vhffs-542-nosvn/vhffs-api/Makefile.am vhffs-agh/vhffs-api/Makefile.am
--- vhffs-542-nosvn/vhffs-api/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-api/Makefile.am	2007-03-28 19:32:36.000000000 +0200
@@ -0,0 +1,3 @@
+SUBDIRS = src
+EXTRA_DIST = debian
+
diff -Nru vhffs-542-nosvn/vhffs-api/src/Changelog vhffs-agh/vhffs-api/src/Changelog
--- vhffs-542-nosvn/vhffs-api/src/Changelog	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Changelog	1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-09/08/2004
-   * Now, there are two databases : one for reading, another for writing.
-   Useful for replication
-   * User and Group inherit from Object
-   * Update databases schemas
-
-08/08/2004
-   * Update User, Group, test_user
-   * Make User and Group herit from Object
-   * User.pm contains now a Group
-   * Fix some bugs
-
-
-01/07/2004 (soda)
-   * Update Httpd.pm
-   * Change the way to store informations. Use $self->{'blabla'} instead of
-     $infos->{'blabla'}. Better way to herit.
-   * Create ACL.pm
-   * Fix Httpd.pm
-   * Fix Object.pm
-
-14/06/2004 (soda)
-   * Update Httpd.pm
-   * Will try to use $self->{'infos'}->{'field'} instead $infos->{'field'}
-     Cause I'm not sure that $infos->... is really OO for Perl.
-   * Update Object.pm
-   * Some problems with heritage
-
-13/06/2004 (soda)
-   * Create this file
-   * Add Object.pm and Httpd.pm
-   * username is forced to lowercase now
-
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/add_acl_dns.pl vhffs-agh/vhffs-api/src/examples/add_acl_dns.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/add_acl_dns.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/add_acl_dns.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w 
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Services::DNS;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/add_acl.pl vhffs-agh/vhffs-api/src/examples/add_acl.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/add_acl.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/add_acl.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Services::Httpd;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_box.pl vhffs-agh/vhffs-api/src/examples/create_box.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_box.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_box.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Services::Mail;
 
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_cvs_panel.pl vhffs-agh/vhffs-api/src/examples/create_cvs_panel.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_cvs_panel.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_cvs_panel.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_cvs.pl vhffs-agh/vhffs-api/src/examples/create_cvs.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_cvs.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-api/src/examples/create_cvs.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_dir.pl vhffs-agh/vhffs-api/src/examples/create_dir.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_dir.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-api/src/examples/create_dir.pl	2007-03-28 19:32:36.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Functions;
 
 print Vhffs::Functions::create_dir( "/data/prout/zozoo/pezojfzpje" );
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_dns.pl vhffs-agh/vhffs-api/src/examples/create_dns.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_dns.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_dns.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_forward.pl vhffs-agh/vhffs-api/src/examples/create_forward.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_forward.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_forward.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w 
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Services::Mail;
 
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_group_by_panel.pl vhffs-agh/vhffs-api/src/examples/create_group_by_panel.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_group_by_panel.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_group_by_panel.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_group.pl vhffs-agh/vhffs-api/src/examples/create_group.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_group.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_group.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_list.pl vhffs-agh/vhffs-api/src/examples/create_list.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_list.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_list.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_mail.pl vhffs-agh/vhffs-api/src/examples/create_mail.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_mail.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_mail.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_mysql_panel.pl vhffs-agh/vhffs-api/src/examples/create_mysql_panel.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_mysql_panel.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_mysql_panel.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_mysql.pl vhffs-agh/vhffs-api/src/examples/create_mysql.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_mysql.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_mysql.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_panel_mail.pl vhffs-agh/vhffs-api/src/examples/create_panel_mail.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_panel_mail.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_panel_mail.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_postgres.pl vhffs-agh/vhffs-api/src/examples/create_postgres.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_postgres.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_postgres.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_repository.pl vhffs-agh/vhffs-api/src/examples/create_repository.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_repository.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_repository.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_user.pl vhffs-agh/vhffs-api/src/examples/create_user.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_user.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_user.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_web_panel.pl vhffs-agh/vhffs-api/src/examples/create_web_panel.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_web_panel.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_web_panel.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/create_web.pl vhffs-agh/vhffs-api/src/examples/create_web.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/create_web.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/create_web.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/delbox.pl vhffs-agh/vhffs-api/src/examples/delbox.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/delbox.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/delbox.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,8 +1,8 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 
 use Vhffs::Conf;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/delete_acl.pl vhffs-agh/vhffs-api/src/examples/delete_acl.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/delete_acl.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/delete_acl.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/generate_password.pl vhffs-agh/vhffs-api/src/examples/generate_password.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/generate_password.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/generate_password.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/get_list.pl vhffs-agh/vhffs-api/src/examples/get_list.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/get_list.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/get_list.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Data::Dumper;
 use Vhffs::Main;
 use Vhffs::Services::Mailing;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/hashdomain.pl vhffs-agh/vhffs-api/src/examples/hashdomain.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/hashdomain.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-api/src/examples/hashdomain.pl	2007-03-28 19:32:36.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Functions;
 
 print Vhffs::Functions::hash_mxdomain("tuxfamily.org");
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/hashhome_example.pl vhffs-agh/vhffs-api/src/examples/hashhome_example.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/hashhome_example.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-api/src/examples/hashhome_example.pl	2007-03-28 19:32:36.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Functions;
 use Vhffs::Main;
 use Data::Dumper;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/hashpopuser.pl vhffs-agh/vhffs-api/src/examples/hashpopuser.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/hashpopuser.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-api/src/examples/hashpopuser.pl	2007-03-28 19:32:36.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Functions;
 
 print Vhffs::Functions::hash_popuser("soda");
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/hash_webdir.pl vhffs-agh/vhffs-api/src/examples/hash_webdir.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/hash_webdir.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-api/src/examples/hash_webdir.pl	2007-03-28 19:32:36.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Functions;
 
 print Vhffs::Functions::hash_webdir( "zozo.tata.com" );
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/join_group.pl vhffs-agh/vhffs-api/src/examples/join_group.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/join_group.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/join_group.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/list_themes.pl vhffs-agh/vhffs-api/src/examples/list_themes.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/list_themes.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-api/src/examples/list_themes.pl	2007-03-28 19:32:36.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Panel::Main;
 use Vhffs::Main;
 use Data::Dumper;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/mailuser_add_box.pl vhffs-agh/vhffs-api/src/examples/mailuser_add_box.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/mailuser_add_box.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/mailuser_add_box.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/mailuser.pl vhffs-agh/vhffs-api/src/examples/mailuser.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/mailuser.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/mailuser.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/Makefile.am vhffs-agh/vhffs-api/src/examples/Makefile.am
--- vhffs-542-nosvn/vhffs-api/src/examples/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-api/src/examples/Makefile.am	2007-04-03 21:11:16.000000000 +0200
@@ -0,0 +1,60 @@
+examples_SCRIPTS = \
+	add_acl_dns.pl \
+	add_acl.pl \
+	create_box.pl \
+	create_cvs_panel.pl \
+	create_cvs.pl \
+	create_dir.pl \
+	create_dns.pl \
+	create_forward.pl \
+	create_group_by_panel.pl \
+	create_group.pl \
+	create_list.pl \
+	create_mail.pl \
+	create_mysql_panel.pl \
+	create_mysql.pl \
+	create_panel_mail.pl \
+	create_postgres.pl \
+	create_repository.pl \
+	create_user.pl \
+	create_web_panel.pl \
+	create_web.pl \
+	delbox.pl \
+	delete_acl.pl \
+	generate_password.pl \
+	get_list.pl \
+	hashdomain.pl \
+	hashhome_example.pl \
+	hashpopuser.pl \
+	hash_webdir.pl \
+	join_group.pl \
+	list_themes.pl \
+	mailuser_add_box.pl \
+	mailuser.pl \
+	modify_acl.pl \
+	modify_user.pl \
+	perm_for_user.pl \
+	print_domain.pl \
+	show_acl_per_object.pl \
+	show_dns_per_group.pl \
+	show_dns_per_user.pl \
+	show_dumper_cvs.pl \
+	show_dumper_group.pl \
+	show_dumper_object.pl \
+	show_dumper_user.pl \
+	show_groups_per_user.pl \
+	show_last_users.pl \
+	show_mail_conf.pl \
+	show_mail_per_group.pl \
+	show_members_from_list.pl \
+	stats.pl
+
+# Define the substitution we need to point perl script at correct location
+do_sed = $(SED) --in-place \
+	-e 's,%PERL%,$(PERL),g' \
+	-e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g'
+
+install-data-hook:
+	for f in $(examples_DATA) ; do \
+		$(do_sed) $$f; \
+	done
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/modify_acl.pl vhffs-agh/vhffs-api/src/examples/modify_acl.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/modify_acl.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/modify_acl.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Services::Httpd;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/modify_user.pl vhffs-agh/vhffs-api/src/examples/modify_user.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/modify_user.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/modify_user.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/perm_for_user.pl vhffs-agh/vhffs-api/src/examples/perm_for_user.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/perm_for_user.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/perm_for_user.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,7 +1,7 @@
-#!/usr/bin/perl
+#!%PERL%
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/print_domain.pl vhffs-agh/vhffs-api/src/examples/print_domain.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/print_domain.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/print_domain.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Services::DNS;
 
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/show_acl_per_object.pl vhffs-agh/vhffs-api/src/examples/show_acl_per_object.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/show_acl_per_object.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/show_acl_per_object.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl  -I/vhffs/vhffs-api/src/
+#!%PERL%
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Acl;
 use Vhffs::Services::Mysql;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/show_dns_per_group.pl vhffs-agh/vhffs-api/src/examples/show_dns_per_group.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/show_dns_per_group.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/show_dns_per_group.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL%
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Group;
 use Vhffs::Main;
 use Vhffs::Panel::DNS;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/show_dns_per_user.pl vhffs-agh/vhffs-api/src/examples/show_dns_per_user.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/show_dns_per_user.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/show_dns_per_user.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::DNS;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/show_dumper_cvs.pl vhffs-agh/vhffs-api/src/examples/show_dumper_cvs.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/show_dumper_cvs.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-api/src/examples/show_dumper_cvs.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/show_dumper_group.pl vhffs-agh/vhffs-api/src/examples/show_dumper_group.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/show_dumper_group.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/show_dumper_group.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Group;
 use Vhffs::Main;
 
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/show_dumper_object.pl vhffs-agh/vhffs-api/src/examples/show_dumper_object.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/show_dumper_object.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/show_dumper_object.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/show_dumper_user.pl vhffs-agh/vhffs-api/src/examples/show_dumper_user.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/show_dumper_user.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/show_dumper_user.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/show_groups_per_user.pl vhffs-agh/vhffs-api/src/examples/show_groups_per_user.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/show_groups_per_user.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/show_groups_per_user.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/show_last_users.pl vhffs-agh/vhffs-api/src/examples/show_last_users.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/show_last_users.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-api/src/examples/show_last_users.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/show_mail_conf.pl vhffs-agh/vhffs-api/src/examples/show_mail_conf.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/show_mail_conf.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-api/src/examples/show_mail_conf.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Conf;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/show_mail_per_group.pl vhffs-agh/vhffs-api/src/examples/show_mail_per_group.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/show_mail_per_group.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/show_mail_per_group.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Group;
 use Vhffs::Main;
 use Vhffs::Panel::Mail;
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/show_members_from_list.pl vhffs-agh/vhffs-api/src/examples/show_members_from_list.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/show_members_from_list.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/show_members_from_list.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/
+#!%PERL% -w
 
 
 use strict;
 
 use Data::Dumper;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Services::Mailing;
 
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/stats.pl vhffs-agh/vhffs-api/src/examples/stats.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/stats.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/examples/stats.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Stats;
 
diff -Nru vhffs-542-nosvn/vhffs-api/src/examples/test2.pl vhffs-agh/vhffs-api/src/examples/test2.pl
--- vhffs-542-nosvn/vhffs-api/src/examples/test2.pl	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-api/src/examples/test2.pl	2007-03-28 19:32:36.000000000 +0200
@@ -0,0 +1,8 @@
+#!%PERL%
+
+use lib '%VHFFS_LIB_DIR%';
+use Vhffs::Constants;
+
+my $lol="ACL_VIEW";
+
+print ${Vhffs::Constants::$lol};
diff -Nru vhffs-542-nosvn/vhffs-api/src/Makefile.am vhffs-agh/vhffs-api/src/Makefile.am
--- vhffs-542-nosvn/vhffs-api/src/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Makefile.am	2007-03-28 19:32:36.000000000 +0200
@@ -0,0 +1,3 @@
+SUBDIRS = Vhffs
+EXTRA_DIST = examples
+
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Acl.pm vhffs-agh/vhffs-api/src/Vhffs/Acl.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Acl.pm	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Acl.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Conf.pm vhffs-agh/vhffs-api/src/Vhffs/Conf.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Conf.pm	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Conf.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Constants.pm vhffs-agh/vhffs-api/src/Vhffs/Constants.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Constants.pm	2007-04-03 21:24:44.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Constants.pm	2007-04-03 21:31:06.000000000 +0200
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-
 package Vhffs::Constants;
 
 use strict;
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/DB.pm vhffs-agh/vhffs-api/src/Vhffs/DB.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/DB.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/DB.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Debug.pm vhffs-agh/vhffs-api/src/Vhffs/Debug.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Debug.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Debug.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/perl -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Functions.pm vhffs-agh/vhffs-api/src/Vhffs/Functions.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Functions.pm	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Functions.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Group.pm vhffs-agh/vhffs-api/src/Vhffs/Group.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Group.pm	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Group.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Intl.pm vhffs-agh/vhffs-api/src/Vhffs/Intl.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Intl.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Intl.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Listengine/Intl.pm vhffs-agh/vhffs-api/src/Vhffs/Listengine/Intl.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Listengine/Intl.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Listengine/Intl.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Listengine/Listengine.pm vhffs-agh/vhffs-api/src/Vhffs/Listengine/Listengine.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Listengine/Listengine.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Listengine/Listengine.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Listengine/Mail.pm vhffs-agh/vhffs-api/src/Vhffs/Listengine/Mail.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Listengine/Mail.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Listengine/Mail.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Listengine/Panel.pm vhffs-agh/vhffs-api/src/Vhffs/Listengine/Panel.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Listengine/Panel.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Listengine/Panel.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Main.pm vhffs-agh/vhffs-api/src/Vhffs/Main.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Main.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Main.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Makefile.am vhffs-agh/vhffs-api/src/Vhffs/Makefile.am
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Makefile.am	2007-04-06 18:14:25.000000000 +0200
@@ -0,0 +1,71 @@
+apidir = @APIDIR@
+nobase_api_DATA = \
+	Acl.pm \
+	Conf.pm \
+	Constants.pm \
+	DB.pm \
+	Debug.pm \
+	Functions.pm \
+	Group.pm \
+	Intl.pm \
+	Main.pm \
+	Note.pm \
+	Object.pm \
+	Robots.pm \
+	Stats.pm \
+	User.pm \
+	Listengine/Intl.pm \
+	Listengine/Listengine.pm \
+	Listengine/Mail.pm \
+	Listengine/Panel.pm \
+	Misc/Listengine.pm \
+	Misc/Mailings.pm \
+	Misc/Salt.pm \
+	Panel/Admin.pm \
+	Panel/Avatar.pm \
+	Panel/Commons.pm \
+	Panel/Confirmation.pm \
+	Panel/Cvs.pm \
+	Panel/DNS.pm \
+	Panel/Group.pm \
+	Panel/Handler.pm \
+	Panel/Mail.pm \
+	Panel/Mailinglist.pm \
+	Panel/Main.pm \
+	Panel/Menu.pm \
+	Panel/Mysql.pm \
+	Panel/Object.pm \
+	Panel/Pgsql.pm \
+	Panel/Repository.pm \
+	Panel/Svn.pm \
+	Panel/User.pm \
+	Panel/Web.pm \
+	Robots/Cvs.pm \
+	Robots/Group.pm \
+	Robots/Mailing.pm \
+	Robots/Mysql.pm \
+	Robots/Postgres.pm \
+	Robots/Repository.pm \
+	Robots/Svn.pm \
+	Robots/User.pm \
+	Robots/Web.pm \
+	Services/Cvs.pm \
+	Services/DNS.pm \
+	Services/Httpd.pm \
+	Services/Mail.pm \
+	Services/Mailing.pm \
+	Services/MailUser.pm \
+	Services/Mysql.pm \
+	Services/Postgres.pm \
+	Services/Repository.pm \
+	Services/Svn.pm
+
+# Define the substitution we need to point perl script at correct location
+do_sed = $(SED) --in-place \
+	-e 's,%PERL%,$(PERL),g' \
+	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g'
+
+install-data-hook:
+	for f in $(nobase_api_DATA) ; do \
+		$(do_sed) $(DESTDIR)$(apidir)/$$f; \
+	done
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Misc/Listengine.pm vhffs-agh/vhffs-api/src/Vhffs/Misc/Listengine.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Misc/Listengine.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Misc/Listengine.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Misc/Mailings.pm vhffs-agh/vhffs-api/src/Vhffs/Misc/Mailings.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Misc/Mailings.pm	2007-04-03 21:24:43.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Misc/Mailings.pm	2007-04-03 21:31:06.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Misc/Salt.pm vhffs-agh/vhffs-api/src/Vhffs/Misc/Salt.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Misc/Salt.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Misc/Salt.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Note.pm vhffs-agh/vhffs-api/src/Vhffs/Note.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Note.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Note.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Object.pm vhffs-agh/vhffs-api/src/Vhffs/Object.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Object.pm	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Object.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/perl -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -94,7 +93,7 @@
 
 sub _new {
     my ($class, $main, $oid, $owner_uid, $date_creation, $description, $state, $type) = @_;
-
+    
     $self = {};
 
     bless($self, $class);
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Admin.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Admin.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Admin.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Admin.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Avatar.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Avatar.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Avatar.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Avatar.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Commons.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Commons.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Commons.pm	2007-04-03 21:24:44.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Commons.pm	2007-04-03 21:31:06.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Confirmation.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Confirmation.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Confirmation.pm	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Confirmation.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Cvs.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Cvs.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Cvs.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Cvs.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/DNS.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/DNS.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/DNS.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/DNS.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Group.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Group.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Group.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Group.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Mailinglist.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Mailinglist.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Mailinglist.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Mailinglist.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Mail.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Mail.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Mail.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Mail.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Main.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Main.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Main.pm	2007-04-03 21:24:44.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Main.pm	2007-04-03 21:31:06.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 
 package Vhffs::Panel::Main;
 require Exporter;
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Menu.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Menu.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Menu.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Menu.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Mysql.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Mysql.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Mysql.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Mysql.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Object.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Object.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Object.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Object.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Pgsql.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Pgsql.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Pgsql.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Pgsql.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Repository.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Repository.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Repository.pm	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Repository.pm	2007-03-28 19:51:03.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Svn.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Svn.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Svn.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Svn.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/User.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/User.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/User.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/User.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Web.pm vhffs-agh/vhffs-api/src/Vhffs/Panel/Web.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Panel/Web.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Panel/Web.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Cvs.pm vhffs-agh/vhffs-api/src/Vhffs/Robots/Cvs.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Cvs.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Robots/Cvs.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Group.pm vhffs-agh/vhffs-api/src/Vhffs/Robots/Group.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Group.pm	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Robots/Group.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Mailing.pm vhffs-agh/vhffs-api/src/Vhffs/Robots/Mailing.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Mailing.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Robots/Mailing.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Mysql.pm vhffs-agh/vhffs-api/src/Vhffs/Robots/Mysql.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Mysql.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Robots/Mysql.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Postgres.pm vhffs-agh/vhffs-api/src/Vhffs/Robots/Postgres.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Postgres.pm	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Robots/Postgres.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Repository.pm vhffs-agh/vhffs-api/src/Vhffs/Robots/Repository.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Repository.pm	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Robots/Repository.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Svn.pm vhffs-agh/vhffs-api/src/Vhffs/Robots/Svn.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Svn.pm	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Robots/Svn.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/User.pm vhffs-agh/vhffs-api/src/Vhffs/Robots/User.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/User.pm	2007-04-03 21:24:44.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Robots/User.pm	2007-04-03 21:31:06.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Web.pm vhffs-agh/vhffs-api/src/Vhffs/Robots/Web.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots/Web.pm	2007-02-27 22:17:15.000000000 +0100
+++ vhffs-agh/vhffs-api/src/Vhffs/Robots/Web.pm	2007-03-28 19:32:36.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots.pm vhffs-agh/vhffs-api/src/Vhffs/Robots.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Robots.pm	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Robots.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Cvs.pm vhffs-agh/vhffs-api/src/Vhffs/Services/Cvs.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Cvs.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Services/Cvs.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/DNS.pm vhffs-agh/vhffs-api/src/Vhffs/Services/DNS.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/DNS.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Services/DNS.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Httpd.pm vhffs-agh/vhffs-api/src/Vhffs/Services/Httpd.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Httpd.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Services/Httpd.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Mailing.pm vhffs-agh/vhffs-api/src/Vhffs/Services/Mailing.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Mailing.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Services/Mailing.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Mail.pm vhffs-agh/vhffs-api/src/Vhffs/Services/Mail.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Mail.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Services/Mail.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/MailUser.pm vhffs-agh/vhffs-api/src/Vhffs/Services/MailUser.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/MailUser.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Services/MailUser.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Mysql.pm vhffs-agh/vhffs-api/src/Vhffs/Services/Mysql.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Mysql.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Services/Mysql.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Postgres.pm vhffs-agh/vhffs-api/src/Vhffs/Services/Postgres.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Postgres.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Services/Postgres.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Repository.pm vhffs-agh/vhffs-api/src/Vhffs/Services/Repository.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Repository.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Services/Repository.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Svn.pm vhffs-agh/vhffs-api/src/Vhffs/Services/Svn.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Services/Svn.pm	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Services/Svn.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/Stats.pm vhffs-agh/vhffs-api/src/Vhffs/Stats.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/Stats.pm	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/Stats.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-api/src/Vhffs/User.pm vhffs-agh/vhffs-api/src/Vhffs/User.pm
--- vhffs-542-nosvn/vhffs-api/src/Vhffs/User.pm	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-api/src/Vhffs/User.pm	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-backend/conf/vhffs.conf vhffs-agh/vhffs-backend/conf/vhffs.conf
--- vhffs-542-nosvn/vhffs-backend/conf/vhffs.conf	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-backend/conf/vhffs.conf	1970-01-01 01:00:00.000000000 +0100
@@ -1,361 +0,0 @@
-######
-# This is the default configuration file for VHFFS
-# Please ask vhffs@xxxxxxxxx for questions
-# Visit http://www.vhffs.org
-###############################
-<global>
-	#This is the name of your hosting service
-	host_name		=	My Hosting service
-
-	#The directory where you store ALL data
-	datadir			=	/data
-
-	#Directory which contains templates for the vhffs panel
-	templatedir		=	/usr/share/vhffs/templates/
-
-	#Directory which contains themes
-	themesdir		=	/usr/share/vhffs/panel/themes/
-
-	#The default theme
-	default_theme		=	vhffs
-
-	#Directory which contains internationalisation stuff
-	intldir			=	/usr/share/vhffs/intl/
-
-	#The default language
-	default_language	=	en_US
-
-	#Mail sent to hosted people have From: vhffs_master
-	vhffs_master 		=	VHFFS Admin <admin@localhost>
-
-	#Mail of moderator
-	vhffs_moderator 	=	VHFFS Admin <moderator@localhost>
-
-	#Tag inserted in the subject of each sended mail
-	mailtag 		=	[VHFFS]
-
-	#Allow subscribing to the platform
-	allow_subscribe		=	yes
-
-	#The mail where alert are sent
-	alert_mail		=	root@localhost
-
-	moderation		= yes
-
-	########
-	#Modules
-	#For each modules, you can use it if you declare "yes"
-	#For example, to disable the web service, you
-	#can specify use_web = no
-	<modules>
-		use_web		=	yes
-		use_mysql	=	yes
-		use_mail	=	no
-		use_cvs		=	no
-		use_svn		=	no
-		use_postgres	=	no
-		use_dns		=	no
-		use_mailing	=	no
-		use_mailuser	=	no
-		use_repository	=	no
-	</modules>
-
-	####################
-	#Panel configuration
-	<panel>
-		#URL to the panel
-		url				=   http://your.panel.url
-
-		#This is the URL display for the "Help" link in the panel
-		help_url		=	http://help.hoster
-
-		#URL to the statistics
-		stats_url		=	http://stats.hoster
-
-
-		phpmyadmin_url		=	http://phpmyadmin.hoster
-		phppgadmin_url		=	http://phppgadmin.hoster
-
-		#Is the panel open or not ?
-		open			= yes
-
-		#Key to crypt the confirmation code, it must be 8 characters long
-		subscribe_code_encrypt_key	=	AbCdEfGh
-
-		#Use the public section of VHFFS
-		use_public		=	yes
-
-		#Use avatar or not ? If yes, you must create a /data/avatars and change owner/permissions
-		#so that the webserver can write into this directory
-		use_avatar		= yes
-		users			=	yes
-		groups			=	yes
-
-		#Print statistics in the main page of VHFFS ?
-		stats_on_home		=	yes
-
-		#Notation is useful to handle aggressive users
-		#If a project is refused by moderation, the note os the user if decreased
-		#If a project or service is accepted, the note is increased
-		use_notation		= yes
-
-		#Use RSS for users and groups ?
-		<rss>
-			users		=	yes
-			groups		=	yes
-		</rss>
-	</panel>
-</global>
-
-
-
-
-#################################################
-# Backend configuration
-#################################################
-<database>
-		driver = pg
-		#Database to use
-		db_name=vhffs
-		#Read Write User Name
-		db_username=vhffs
-		#Passwor
-		db_password=vhffs
-		#DataBase Server
-		db_host=localhost
-		#Database port
-		db_port = 5432
-</database>
-
-
-################################################
-# USERS AND GROUPS
-################################################
-#the default configuration for users
-<users>
-	minuid	=	10000
-	shell	= 	/usr/bin/tuxshell
-	mingid	=	10000
-	default_quota	=	50
-	bad_username_file =	/etc/vhffs/badfile
-	bad_groupname_file	=	/etc/vhffs/badgroup
-	default_firstname = Vhffs Firstname
-	default_lastname = Vhffs Lastname
-	default_address = Vhffs Address
-	default_city = Vhffs City
-	default_zipcode = 123456
-	default_mail = dave@xxxxxxxx
-	default_country = Disneyland
-</users>
-
-
-
-<system>
-	<shells>
-		available	=	/bin/false /bin/tuxshell /bin/bash
-		default		= 	/bin/false
-	</shells>
-</system>
-
-
-#####################################
-# SERVICES
-#####################################
-<services>
-
-	<web>
-		# Where to find log from webserver, each webserver should be in a separate directory, example :
-		# - /data/logs/web/incoming/webserver0
-		# - /data/logs/web/incoming/webserver1
-		# - ...
-		log_incoming_root = /data/logs/web/incoming
-
-		# The number of maximum rotations, a rotation is made each time the robot to create stats is ran
-		log_incoming_rotations = 7
-
-		# Should I compress rotated logs ?
-		log_incoming_compress = yes
-
-		# Where to put parsed logfile from each website, it uses the same hash model of web storage,
-		# consider using the same tree for both so user have access to its logs in its ftp account.
-		# If log_parsed_root = /data/web and log_parsed_dir = logs then example.com logs
-		# will be in /data/web/1b/df/72/example.com/logs/
-		log_parsed_root = /data/web
-
-		# Same as incoming
-		log_parsed_rotation = 7
-		log_parsed_compress = yes		
-
-		# Where to find the awstats sample file ?
-		log_awstats_sample = /usr/lib/vhffs/bots/misc/awstats.sample
-
-		# Where to find awstats (caution, you must apply the vhffs patch on)
-		log_awstats = /var/www/stats/awstats.pl
-
-		# Is apache running locally or not ? (If not you should use the ugly remote restart of apaches over nfs)
-		log_apachelocal = yes
-
-		# If it runs locally, where is apache2ctl ?
-		log_apachectl = /usr/sbin/apache2ctl
-	</web>
-
-	#DNS configuration
-	<dns>
-		#Default configuration for each domain-name
-		default_ns1 = ns1.hoster.org
-		default_ns2 = ns2.hoster.org
-		default_mx1 = mx1.hoster.org
-		default_mx2 = mx2.hoster.org
-
-		default_a	= 1.2.3.4
-
-		default_ttl = 86400
-		default_aux = 0
-
-		default_refresh = 28800
-		default_retry = 7200
-		default_expire = 604800
-		default_minimum = 86400
-
-		default_serial = 1
-		default_mbox = adm.your.hoster.ext.
-		<init>
-			<a>
-				www = 80.0.0.1
-				default = 10.0.0.1
-			</a>
-			<mx>
-				10	=	mx1.hoster.org
-				20	=	mx2.hoster.org
-			</mx>
-			<ns>
-				ns1.hoster.org
-				ns2.hoster.org
-			</ns>
-		</init>
-	</dns>
-	<apache>
-		port=80
-		pidfile=/var/run/apache.pid
-		confdir=/etc/apache/conf/
-		htdocsdir=
-		default_domain = vhffs.org
-	</apache>
-
-	<cvs>
-		cvsweb_url = "http://cvsweb.hoster";	
-		cvsdoc_url = "http://faq.hoster";
-	</cvs>
-	<mysql>
-		host		= localhost
-		username	= root
-		password	= vhffs
-		mysqldump_path	= /usr/bin/mysqldump
-	</mysql>
-	<postgresql>
-		host		= localhost
-		username	= vhffs
-		password	= zepojf
-		pgdump_path	= /usr/bin/pg_dump
-	</postgresql>
-	<subversion>
-		svnweb_url = "http://svnweb.hoster";	
-		help_url	=	"http://myhost.tld/file.html";
-		uid	=	33
-		gid	=	33
-	</subversion>
-	<mail>
-		use_nospam	=	yes
-		use_novirus	=	yes
-	</mail>
-
-	#The mailuser service allow a user to get a mail account
-	#on a default domain
-	#With with module, ALL users get an email adress for a domain
-	#The domain MUST exists on VHFFS, and should be owned by the user given in this configuration
-	# groupneeded : the user cannot create his mail account if it doesn't have a group
-	<mailuser>
-		activate	=	no
-		groupneeded	=	yes
-		domain		=	myhost.org
-		user 		=	cat
-	</mailuser>
-	<mailing>
-		default_domain = lists.tuxfamily.org
-	</mailing>
-
-	#Configuration for listengine
-	<listengine>
-		#The domain is used when listengine bounces mails to SMTP server
-		#Listengine will send HELO domain to the SMTP sever
-		domain		=	"myhost.tld"
-		#Where we store listengine data
-		datadir		=	"/data/listengine"
-		#Email of listmaster
-		listmaster		= "listmaster@xxxxxxxxxx"
-		#SMTP Server to bounce listengine mails
-		smtp_server	= "localhost"
-		#Directory which contains template for the archives
-		templatesdir	=	/usr/share/vhffs/listengine/templates/
-		#Directory which contains misc files
-		miscdir		=	/usr/share/vhffs/listengine/misc/
-		#Url of archives
-		www-archives	=	http://localhost/listengine
-	</listengine>
-
-
-	#Configuration of download repository
-	<repository>
-		# Prefix of URL displayed in the panel
-		repository_url	=	"http://download.vhffs.org/";
-
-		# The default quota
-		default_quota	=	1024
-
-		# Where to find log from downloads servers, each server should be in a separate directory, example :
-		# - /data/logs/repository/incoming/webserver0
-		# - /data/logs/repository/incoming/webserver1
-		# - ...
-		# and http log must be called http.log and ftp log ftp.log
-		log_incoming_root = /data/logs/repository/incoming
-
-		# The number of maximum rotations, a rotation is made each time the robot to create stats is ran
-		log_incoming_rotations = 7
-
-		# Should I compress rotated logs ?
-		log_incoming_compress = yes
-
-		# Where to put parsed logfile from each repository
-		log_parsed_root = /data/logs/repository/parsed
-
-		# Same as incoming
-		log_parsed_rotation = 7
-		log_parsed_compress = yes		
-
-		# Where to find the awstats sample file ?
-		log_awstats_sample = /usr/lib/vhffs/bots/misc/repository.awstats.sample
-
-		# Where to find awstats (caution, you must apply the vhffs patch on)
-		log_awstats = /data/logs/repository/awstats.pl
-
-		# Is apache running locally or not ? (If not you should use the ugly remote restart of apaches over nfs)
-		log_apachelocal = yes
-
-		# If it runs locally, where is apache2ctl ?
-		log_apachectl = /usr/sbin/apache2ctl
-	</repository>
-</services>
-
-
-#Robots configuration
-<robots>
-	#Robots should log or not ?
-	use_logging = yes
-	#Logfile to log events
-	logfile = /var/log/vhffs.log
-	#Robots should use lock file ?
-	#If they do, only one robot can be executed in the same-time
-	use_lock = yes
-	lockfile = /var/lock/vhffslock
-</robots>
-	
diff -Nru vhffs-542-nosvn/vhffs-backend/conf/vhffs.conf.in vhffs-agh/vhffs-backend/conf/vhffs.conf.in
--- vhffs-542-nosvn/vhffs-backend/conf/vhffs.conf.in	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-backend/conf/vhffs.conf.in	2007-04-06 18:14:25.000000000 +0200
@@ -0,0 +1,324 @@
+######
+# This is the default configuration file for VHFFS
+# Please ask vhffs@xxxxxxxxx for questions
+# Visit http://www.vhffs.org
+###############################
+<global>
+	#This is the name of your hosting service
+	host_name		=	My Hosting service
+
+	#The directory where you store ALL data
+	datadir			=	/data
+
+	#Directory which contains templates for the vhffs panel
+	templatedir		=	@TEMPLATESDIR@
+
+	#Directory which contains themes
+	themesdir		=	@PANELDIR@/themes
+
+	#The default theme
+	default_theme		=	vhffs
+
+	#Directory which contains internationalisation stuff
+	intldir			=	/usr/share/vhffs/intl/
+
+	#The default language
+	default_language	=	en_US
+
+	#Mail sent to hosted people have From: vhffs_master
+	vhffs_master 		=	VHFFS Admin <admin@localhost>
+
+	#Mail of moderator
+	vhffs_moderator 	=	VHFFS Admin <moderator@localhost>
+
+	#Tag inserted in the subject of each sended mail
+	mailtag 		=	[VHFFS]
+
+	#Allow subscribing to the platform
+	allow_subscribe		=	yes
+
+	#The mail where alert are sent
+	alert_mail		=	root@localhost
+
+	moderation		= yes
+
+	########
+	#Modules
+	#For each modules, you can use it if you declare "yes"
+	#For example, to disable the web service, you
+	#can specify use_web = no
+	<modules>
+		use_web		=	yes
+		use_mysql	=	yes
+		use_mail	=	no
+		use_cvs		=	no
+		use_svn		=	no
+		use_postgres	=	no
+		use_dns		=	no
+		use_mailing	=	no
+		use_mailuser	=	no
+		use_repository	=	no
+	</modules>
+
+	####################
+	#Panel configuration
+	<panel>
+		#URL to the panel
+		url				=   http://your.panel.url
+
+		#This is the URL display for the "Help" link in the panel
+		help_url		=	http://help.hoster
+
+		#URL to the statistics
+		stats_url		=	http://stats.hoster
+
+
+		phpmyadmin_url		=	http://phpmyadmin.hoster
+		phppgadmin_url		=	http://phppgadmin.hoster
+
+		#Is the panel open or not ?
+		open			= yes
+
+		#Key to crypt the confirmation code, it must be 8 characters long
+		subscribe_code_encrypt_key	=	AbCdEfGh
+
+		#Use the public section of VHFFS
+		use_public		=	yes
+
+		#Use avatar or not ? If yes, you must create a /data/avatars and change owner/permissions
+		#so that the webserver can write into this directory
+		use_avatar		= yes
+		users			=	yes
+		groups			=	yes
+
+		#Print statistics in the main page of VHFFS ?
+		stats_on_home		=	yes
+
+		#Notation is useful to handle aggressive users
+		#If a project is refused by moderation, the note os the user if decreased
+		#If a project or service is accepted, the note is increased
+		use_notation		= yes
+
+		#Use RSS for users and groups ?
+		<rss>
+			users		=	yes
+			groups		=	yes
+		</rss>
+	</panel>
+</global>
+
+
+
+
+#################################################
+# Backend configuration
+#################################################
+<database>
+		driver = pg
+		#Database to use
+		db_name=vhffs
+		#Read Write User Name
+		db_username=vhffs
+		#Passwor
+		db_password=vhffs
+		#DataBase Server
+		db_host=localhost
+		#Database port
+		db_port = 5432
+</database>
+
+
+################################################
+# USERS AND GROUPS
+################################################
+#the default configuration for users
+<users>
+	minuid	=	@MINUID@
+	shell	= 	/usr/bin/tuxshell
+	mingid	=	@MINGID@
+	default_quota	=	50
+	bad_username_file =	@CONFDIR@/badfile
+	bad_groupname_file	=	@CONFDIR@/badgroup
+	default_firstname = Vhffs Firstname
+	default_lastname = Vhffs Lastname
+	default_address = Vhffs Address
+	default_city = Vhffs City
+	default_zipcode = 123456
+	default_mail = dave@xxxxxxxx
+	default_country = Disneyland
+</users>
+
+
+
+<system>
+	<shells>
+		available	=	/bin/false /bin/tuxshell /bin/bash
+		default		= 	/bin/false
+	</shells>
+</system>
+
+
+#####################################
+# SERVICES
+#####################################
+<services>
+
+	<web>
+		# Where to find log from webserver, each webserver should be in a separate directory, example :
+		# - /data/logs/web/incoming/webserver0
+		# - /data/logs/web/incoming/webserver1
+		# - ...
+		log_incoming_root = /data/logs/web/incoming
+
+		# The number of maximum rotations, a rotation is made each time the robots to create stats is ran
+		log_incoming_rotations = 7
+
+		# Should I compress rotated logs ?
+		log_incoming_compress = yes
+
+		# Where to put parsed logfile from each website, it uses the same hash model of web storage,
+		# consider using the same tree for both so user have access to its logs in its ftp account.
+		# If log_parsed_root = /data/web and log_parsed_dir = logs then example.com logs
+		# will be in /data/web/1b/df/72/example.com/logs/
+		log_parsed_root = /data/web
+
+		# Same as incoming
+		log_parsed_rotation = 7
+		log_parsed_compress = yes		
+
+		# Where to find the awstat sampe file ?
+		log_awstats_sample = /usr/lib/vhffs/bots/misc/awstats.sample
+
+		# Where to find awstat (caution, you must apply the vhffs patch on)
+		log_awstats = /var/www/stats/awstats.pl
+
+		# Is apache running locally or not ? (If not you should use the ugly remote restart of apaches over nfs)
+		log_apachelocal = yes
+
+		# If it runs locally, where is apache2ctl ?
+		log_apachectl = /usr/sbin/apache2ctl
+	</web>
+
+	#DNS configuration
+	<dns>
+		#Default configuration for each domain-name
+		default_ns1 = ns1.hoster.org
+		default_ns2 = ns2.hoster.org
+		default_mx1 = mx1.hoster.org
+		default_mx2 = mx2.hoster.org
+
+		default_a	= 1.2.3.4
+
+		default_ttl = 86400
+		default_aux = 0
+
+		default_refresh = 28800
+		default_retry = 7200
+		default_expire = 604800
+		default_minimum = 86400
+
+		default_serial = 1
+		default_mbox = adm.your.hoster.ext.
+		<init>
+			<a>
+				www = 80.0.0.1
+				default = 10.0.0.1
+			</a>
+			<mx>
+				10	=	mx1.hoster.org
+				20	=	mx2.hoster.org
+			</mx>
+			<ns>
+				ns1.hoster.org
+				ns2.hoster.org
+			</ns>
+		</init>
+	</dns>
+	<apache>
+		port=80
+		pidfile=/var/run/apache.pid
+		confdir=/etc/apache/conf/
+		htdocsdir=
+		default_domain = vhffs.org
+	</apache>
+
+	<cvs>
+		cvsweb_url = "http://cvsweb.hoster";	
+		cvsdoc_url = "http://faq.hoster";
+	</cvs>
+	<mysql>
+		host		= localhost
+		username	= root
+		password	= vhffs
+	</mysql>
+	<postgresql>
+		host		= localhost
+		username	= vhffs
+		password	= zepojf
+	</postgresql>
+	<subversion>
+		svnweb_url = "http://svnweb.hoster";	
+		help_url	=	"http://myhost.tld/file.html";
+		uid	=	33
+		gid	=	33
+	</subversion>
+	<mail>
+		use_nospam	=	yes
+		use_novirus	=	yes
+	</mail>
+
+	#The mailuser service allow a user to get a mail account
+	#on a default domain
+	#With with module, ALL users get an email adress for a domain
+	#The domain MUST exists on VHFFS, and should be owned by the user given in this configuration
+	# groupneeded : the user cannot create his mail account if it doesn't have a group
+	<mailuser>
+		activate	=	no
+		groupneeded	=	yes
+		domain		=	myhost.org
+		user 		=	cat
+	</mailuser>
+	<mailing>
+		default_domain = lists.tuxfamily.org
+	</mailing>
+
+	#Configuration for listengine
+	<listengine>
+		#The domain is used when listengine bounces mails to SMTP server
+		#Listengine will send HELO domain to the SMTP sever
+		domain		=	"myhost.tld"
+		#Where we store listengine data
+		datadir		=	"/data/listengine"
+		#Email of listmaster
+		listmaster		= "listmaster@xxxxxxxxxx"
+		#SMTP Server to bounce listengine mails
+		smtp_server	= "localhost"
+		#Directory which contains template for the archives
+		templatesdir	=	@LEWEB@/templates/
+		#Directory which contains misc files
+		miscdir		=	@LEDIR@/misc/
+		#Url of archives
+		www-archives	=	http://localhost/listengine
+	</listengine>
+
+
+	#Configuration of download repository
+	<repository>
+		repository_url	=	"http://download.vhffs.org/";
+		default_quota	=	1024
+	</repository>
+</services>
+
+
+#Robots configuration
+<robots>
+	#Robots should log or not ?
+	use_logging = yes
+	#Logfile to log events
+	logfile = /var/log/vhffs.log
+	#Robots should use lock file ?
+	#If they do, only one robot can be executed in the same-time
+	use_lock = yes
+	lockfile = /var/lock/vhffslock
+</robots>
+	
diff -Nru vhffs-542-nosvn/vhffs-backend/Makefile.am vhffs-agh/vhffs-backend/Makefile.am
--- vhffs-542-nosvn/vhffs-backend/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-backend/Makefile.am	2007-03-28 19:33:09.000000000 +0200
@@ -0,0 +1,11 @@
+confdir = @CONFDIR@
+conf_DATA = conf/vhffs.conf
+
+maildir = @MAILSDIR@
+mail_DATA = \
+	mails/largefile-copyfailed \
+	mails/largefile-finished \
+	mails/largefile-upload 
+	
+backenddir = @BACKENDDIR@
+backend_DATA = src/pgsql/initdb.sql
diff -Nru vhffs-542-nosvn/vhffs-backend/src/pgsql/initdb.sql vhffs-agh/vhffs-backend/src/pgsql/initdb.sql
--- vhffs-542-nosvn/vhffs-backend/src/pgsql/initdb.sql	2007-04-05 21:27:25.000000000 +0200
+++ vhffs-agh/vhffs-backend/src/pgsql/initdb.sql	1970-01-01 01:00:00.000000000 +0100
@@ -1,387 +0,0 @@
-/*
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without 
-# modification, are permitted provided that the following conditions 
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright 
-#   notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in 
-#   the documentation and/or other materials provided with the 
-#   distribution.
-#3. Neither the name of vhffs nor the names of its contributors 
-#   may be used to endorse or promote products derived from this 
-#   software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-# POSSIBILITY OF SUCH DAMAGE.
-*/	
-
-CREATE TABLE vhffs_object
-(
-	object_id serial,
-	owner_uid int4,
-	date_creation timestamp,
-	state int4 NOT NULL,
-	description TEXT,
-	type int4 DEFAULT 0,
-	CONSTRAINT vhffs_object_pkey PRIMARY KEY (object_id)
-) WITH OIDS;
-
-
-CREATE TABLE vhffs_acl
-(
-	acl_id serial,
-	oid_src int4,
-	perm int4 NOT NULL,
-	oid_dst int4 ,
-	CONSTRAINT vhffs_acl_pkey PRIMARY KEY (acl_id)
-) WITH OIDS;
-
-CREATE TABLE vhffs_groups
-(
-	gid serial,
-	groupname varchar(50) NOT NULL DEFAULT ' ',
-	passwd varchar(20),
-	quota int4 NOT NULL,
-	quota_used int4 NOT NULL DEFAULT 0,
-	object_id int4 NOT NULL,
-	owner_uid int4,
-	uid_mod int4,
-	CONSTRAINT vhffs_groups_pkey PRIMARY KEY (gid)
-) WITH OIDS;
-
-SELECT setval('vhffs_groups_gid_seq', 10000);
-
-CREATE TABLE vhffs_users
-(
-	uid serial,
-	gid int4,
-	username varchar(50) NOT NULL DEFAULT ' ',
-	shell varchar(20) NOT NULL DEFAULT ' ',
-	passwd varchar(40) NOT NULL DEFAULT ' ',
-	homedir varchar(40) NOT NULL DEFAULT ' ',
-	admin int4 NOT NULL,
-	object_id int4 NOT NULL,
-	date_creation timestamp,
-	firstname varchar(250),
-	lastname varchar(250),
-	address text,
-	zipcode varchar(16),
-	city varchar(250),
-	country varchar(250),
-	mail varchar(200),
-	gpg_key varchar(250),
-	note int4 DEFAULT '0',
-	language varchar(16),
-	theme varchar(250),
-	CONSTRAINT vhffs_users_pkey PRIMARY KEY (uid)
-) WITH OIDS;
-
-SELECT setval('vhffs_users_uid_seq', 10000) ;
-
-CREATE TABLE vhffs_boxes
-(
-	domain varchar,
-	local_part varchar,
-	domain_hash varchar NOT NULL,
-	password_hash varchar NOT NULL,
-	mbox_name varchar NOT NULL,
-	password varchar NOT NULL,
-	nospam boolean,
-	novirus boolean,
-	CONSTRAINT vhffs_boxes_pkey PRIMARY KEY (domain,local_part)
-) WITH OIDS;
-
-CREATE TABLE vhffs_cvs
-(
-	cvs_id serial,
-	cvsroot varchar NOT NULL,
-	owner_uid int4, 
-	owner_gid int4,
-	public boolean NOT NULL,
-	object_id int4,
-	CONSTRAINT vhffs_cvs_pkey PRIMARY KEY (cvs_id)
-) WITH OIDS;
-
-CREATE TABLE vhffs_dns
-(
-	dns_id serial,
-	domain varchar(255) NOT NULL,
-	owner_gid int4,
-	owner_uid int4,
-	object_id int4,
-	ns varchar(255) NOT NULL,
-	mbox varchar(255) NOT NULL,
-	serial INTEGER NOT NULL DEFAULT 1,
-	refresh INTEGER NOT NULL DEFAULT 28800,
-	retry INTEGER NOT NULL DEFAULT 7200,
-	expire INTEGER NOT NULL DEFAULT 604800,
-	minimum INTEGER NOT NULL DEFAULT 86400,
-	ttl INTEGER NOT NULL DEFAULT 86400,
-	CONSTRAINT vhffs_dns_pkey4 PRIMARY KEY (dns_id)
-) WITH OIDS;
-
-CREATE TABLE vhffs_dns_rr (
-	id serial,
-	zone INTEGER NOT NULL,
-	name varchar(64) NOT NULL,
-	type VARCHAR(5) NOT NULL,
-	data varchar(128) NOT NULL,
-	aux INTEGER NOT NULL DEFAULT 0,
-	ttl INTEGER NOT NULL DEFAULT 86400,
-	CONSTRAINT vhffs_dns_rr_pkey PRIMARY KEY (id)
-) WITH OIDS;	
-
-CREATE TABLE vhffs_forward
-(
-	domain varchar NOT NULL,
-	local_part varchar NOT NULL,
-	remote_name varchar NOT NULL,
-	password varchar NOT NULL,
-	CONSTRAINT vhffs_forward_pkey PRIMARY KEY (domain , local_part)
-) WITH OIDS;
-
-CREATE TABLE vhffs_httpd
-(
-	httpd_id serial,
-	servername varchar(200) NOT NULL DEFAULT ' ',
-	crawl int4 NOT NULL default '1',
-	owner_http int4 NOT NULL,
-	owner_rev int4 NOT NULL,
-	owner_uid int4,
-	owner_gid int4,
-	trafic int4 NOT NULL,
-	alert_state int4 NOT NULL default '0',
-	alert_limit int4 NOT NULL default '80',
-	object_id int4 NOT NULL,
-	CONSTRAINT vhffs_httpd_pkey PRIMARY KEY (httpd_id)
-) WITH OIDS;
-
-CREATE TABLE vhffs_repository
-(
-	repository_id serial,
-	name varchar NOT NULL,
-	owner_uid int4 NOT NULL,
-	owner_gid int4 NOT NULL,
-	quota int4 NOT NULL,
-	quota_used int4 NOT NULL DEFAULT 0,
-	object_id int4 NOT NULL,
-	CONSTRAINT vhffs_repository_pkey PRIMARY KEY (repository_id)
-) WITH OIDS;
-
-CREATE TABLE vhffs_mailings
-(
-	id_mailing serial,
-	subject VARCHAR NOT NULL,
-	message TEXT NOT NULL,
-	date timestamp,
-	state int4 NOT NULL,
-	CONSTRAINT vhffs_mailings_pkey PRIMARY KEY (id_mailing)
-) WITH OIDS;
-
-
-CREATE TABLE vhffs_mxdomain
-(
-	mxdomain_id serial,
-	domain varchar,
-	unix_user varchar NOT NULL,
-	boxes_path varchar NOT NULL,
-	max_popbox int4 NOT NULL,
-	catchall varchar NOT NULL,
-	owner_uid int4 NOT NULL,
-	owner_gid int4 NOT NULL,
-	object_id int4 NOT NULL,
-	CONSTRAINT vhffs_mxdomain_pkey PRIMARY KEY (mxdomain_id)
-) WITH OIDS;
-
-CREATE TABLE vhffs_ml
-(
-	ml_id serial,
-	local_part varchar(256) NOT NULL,
-	domain varchar(256),
-	prefix varchar(32),
-	owner_uid int4, 
-	owner_gid int4,
-	object_id int4,
-	admin varchar(250) NOT NULL,
-	sub_ctrl int4,
-	post_ctrl int4,
-	reply_to boolean,
-	open_archive boolean,
-	signature varchar(250),
-	CONSTRAINT vhffs_ml_pkey PRIMARY KEY (ml_id)
-) WITH OIDS;
-
-CREATE TABLE vhffs_ml_subscribers
-(
-	sub_id serial,
-	member varchar(256) NOT NULL,
-	perm int4 NOT NULL,
-	hash varchar,
-	ml_id int4 NOT NULL,
-	language varchar(16),
-	CONSTRAINT vhffs_ml_subscribers_pkey PRIMARY KEY (sub_id)
-) WITH OIDS;
-
-CREATE TABLE vhffs_mysql
-(
-	mysql_id serial,
-	dbname varchar(200) NOT NULL,
-	dbuser varchar(200) NOT NULL,
-	owner_uid int4, 
-	owner_gid int4,
-	dbpass VARCHAR(32) NOT NULL,
-	object_id int4,
-	CONSTRAINT vhffs_mysql_pkey PRIMARY KEY (mysql_id)
-) WITH OIDS;
-
-CREATE TABLE vhffs_history
-(
-	history_id serial,
-	object_id int4,
-	date timestamp,
-	message varchar(200),
-	CONSTRAINT vhffs_history_pkey PRIMARY KEY (history_id)
-) WITH OIDS;
-
-CREATE TABLE vhffs_pgsql
-(
-	pgsql_id serial,
-	dbname varchar(200) NOT NULL,
-	dbuser varchar(16) NOT NULL,
-	dbpass varchar(32) NOT NULL,
-	owner_uid int4, 
-	owner_gid int4,
-	object_id int4,
-	CONSTRAINT vhffs_pgsql_pkey PRIMARY KEY (pgsql_id)
-) WITH OIDS;
-
-CREATE TABLE vhffs_svn
-(
-	svn_id SERIAL,
-	reponame varchar NOT NULL,
-	owner_uid int4, 
-	owner_gid int4,
-	public int4 NOT NULL,
-	object_id int4,
-	CONSTRAINT vhffs_svn_pkey PRIMARY KEY( reponame , owner_gid)
-) WITH OIDS;
-
-CREATE TABLE vhffs_user_group
-(
-	uid int4 ,
-	gid int4 ,
-	state int4 ,
-	CONSTRAINT vhffs_user_group_pkey PRIMARY KEY (uid,gid)
-)WITH OIDS;
-
-
-/****** Indexes and unique constraints *******/
-ALTER TABLE vhffs_users ADD CONSTRAINT vhffs_users_unique_username UNIQUE (username);
-ALTER TABLE vhffs_groups ADD CONSTRAINT vhffs_groups_unique_groupname UNIQUE (groupname);
-ALTER TABLE vhffs_cvs ADD CONSTRAINT vhffs_cvs_unique_cvsroot UNIQUE (cvsroot);
-ALTER TABLE vhffs_httpd ADD CONSTRAINT vhffs_httpd_unique_servername UNIQUE (servername);
-ALTER TABLE vhffs_mxdomain ADD CONSTRAINT vhffs_mxdomain_unique_domainname UNIQUE (domain);
-ALTER TABLE vhffs_mysql ADD CONSTRAINT vhffs_mysql_unique_dbname UNIQUE (dbname);
-ALTER TABLE vhffs_mysql ADD CONSTRAINT vhffs_mysql_unique_dbuser UNIQUE (dbuser);
-ALTER TABLE vhffs_pgsql ADD CONSTRAINT vhffs_pgsql_unique_dbname UNIQUE (dbname);
-ALTER TABLE vhffs_pgsql ADD CONSTRAINT vhffs_pgsql_unique_dbuser UNIQUE (dbuser);
-ALTER TABLE vhffs_repository ADD CONSTRAINT vhffs_repository_unique_name UNIQUE (name);
-ALTER TABLE vhffs_svn ADD CONSTRAINT vhffs_svn_unique_reponame UNIQUE (reponame);
-ALTER TABLE vhffs_dns ADD CONSTRAINT vhffs_dns_unique_domain UNIQUE (domain);
-ALTER TABLE vhffs_ml ADD CONSTRAINT vhffs_ml_unique_address UNIQUE (local_part, domain);
-ALTER TABLE vhffs_ml_subscribers ADD CONSTRAINT vhffs_ml_subscribers_member_list UNIQUE (ml_id, member);
-
--- This index drastically improves performances on get_used_letters
-CREATE INDEX idx_vhffs_httpd_servername_firstletter ON vhffs_httpd(substr(servername, 1, 1));
--- state is massively used in WHERE clause, this index improves overall performances
-CREATE INDEX idx_vhffs_object_state ON vhffs_object(state);
-
-/****** Non primary key constraints.
-      Defining foreign keys here allow to create tables in any order.
-*******/
-
-ALTER TABLE vhffs_acl ADD CONSTRAINT fk_vhffs_acl_vhffs_object_dst FOREIGN KEY (oid_dst) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
-ALTER TABLE vhffs_acl ADD CONSTRAINT fk_vhffs_acl_vhffs_object_src FOREIGN KEY (oid_src) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
-
-ALTER TABLE vhffs_groups ADD CONSTRAINT fk_vhffs_group_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
-ALTER TABLE vhffs_groups ADD CONSTRAINT fk_vhffs_group_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users (uid);
-
-ALTER TABLE vhffs_users ADD CONSTRAINT fk_vhffs_users_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object (object_id) ON DELETE CASCADE;
-
-ALTER TABLE vhffs_cvs ADD CONSTRAINT fk_vhffs_cvs_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
-ALTER TABLE vhffs_cvs ADD CONSTRAINT fk_vhffs_cvs_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
-ALTER TABLE vhffs_cvs ADD CONSTRAINT fk_vhffs_cvs_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
-
-ALTER TABLE vhffs_dns ADD CONSTRAINT fk_vhffs_dns_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
-ALTER TABLE vhffs_dns ADD CONSTRAINT fk_vhffs_dns_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
-ALTER TABLE vhffs_dns ADD CONSTRAINT fk_vhffs_dns_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
-
-ALTER TABLE vhffs_dns_rr ADD CONSTRAINT fk_vhffs_dns_rr_vhffs_dns FOREIGN KEY (zone) REFERENCES vhffs_dns(dns_id) ON DELETE CASCADE;
-ALTER TABLE vhffs_dns_rr ADD CONSTRAINT fk_vhffs_dns_rr_chk_type CHECK (type='A' OR type='AAAA' OR type='CNAME' OR type='HINFO' OR type='MX' OR type='NS' OR type='PTR' OR type='RP' OR type='SRV' OR type='TXT');
-
-ALTER TABLE vhffs_httpd ADD CONSTRAINT fk_vhffs_httpd_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
-ALTER TABLE vhffs_httpd ADD CONSTRAINT fk_vhffs_httpd_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
-
-ALTER TABLE vhffs_repository ADD CONSTRAINT fk_vhffs_vhffs_repository_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
-ALTER TABLE vhffs_repository ADD CONSTRAINT fk_vhffs_vhffs_repository_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
-ALTER TABLE vhffs_repository ADD CONSTRAINT fk_vhffs_vhffs_repository_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
-
-ALTER TABLE vhffs_mxdomain ADD CONSTRAINT fk_vhffs_mxdomain_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
-ALTER TABLE vhffs_mxdomain ADD CONSTRAINT fk_vhffs_mxdomain_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
-ALTER TABLE vhffs_mxdomain ADD CONSTRAINT fk_vhffs_mxdomain_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
-
-ALTER TABLE vhffs_ml ADD CONSTRAINT fk_vhffs_ml_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
-ALTER TABLE vhffs_ml ADD CONSTRAINT fk_vhffs_ml_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
-ALTER TABLE vhffs_ml ADD CONSTRAINT fk_vhffs_ml_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
-
-ALTER TABLE vhffs_ml_subscribers ADD CONSTRAINT fk_vhffs_ml_subscribers_vhffs_ml FOREIGN KEY (ml_id) REFERENCES vhffs_ml(ml_id) ON DELETE CASCADE;
-
-ALTER TABLE vhffs_mysql ADD CONSTRAINT fk_vhffs_mysql_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
-ALTER TABLE vhffs_mysql ADD CONSTRAINT fk_vhffs_mysql_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
-ALTER TABLE vhffs_mysql ADD CONSTRAINT fk_vhffs_mysql_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
-
-ALTER TABLE vhffs_history ADD CONSTRAINT fk_vhffs_history_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
-
-ALTER TABLE vhffs_pgsql ADD CONSTRAINT fk_vhffs_pgsql_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
-ALTER TABLE vhffs_pgsql ADD CONSTRAINT fk_vhffs_pgsql_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
-ALTER TABLE vhffs_pgsql ADD CONSTRAINT fk_vhffs_pgsql_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
-
-ALTER TABLE vhffs_svn ADD CONSTRAINT fk_vhffs_svn_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
-ALTER TABLE vhffs_svn ADD CONSTRAINT fk_vhffs_svn_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
-ALTER TABLE vhffs_svn ADD CONSTRAINT fk_vhffs_svn_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
-
-ALTER TABLE vhffs_user_group ADD CONSTRAINT fk_vhffs_user_group_vhffs_users FOREIGN KEY (uid) REFERENCES vhffs_users (uid) ON DELETE CASCADE;
-ALTER TABLE vhffs_user_group ADD CONSTRAINT fk_vhffs_user_group_vhffs_groups FOREIGN KEY (gid) REFERENCES vhffs_groups (gid) ON DELETE CASCADE;
-
-
-CREATE VIEW vhffs_passwd AS
-SELECT uid, gid, username, shell, '*'::character varying AS passwd, homedir
-FROM vhffs_users;
-
-CREATE VIEW vhffs_shadow AS
-SELECT uid, gid, username, shell, passwd, '0'::int4 as newtok , '0'::int4 as expired , homedir
-FROM vhffs_users;
-
-CREATE VIEW vhffs_forum AS
-SELECT users.username, users.passwd, users.firstname, users.lastname, users.mail, users.date_creation, object.state
-FROM vhffs_users users, vhffs_object object
-WHERE object.object_id=users.object_id;
-
-CREATE VIEW vhffs_dns_soa AS
-SELECT dns.dns_id AS id, dns.domain || '.' AS origin , dns.ns, dns.mbox, dns.serial, dns.refresh, dns.retry, dns.expire, dns.minimum, dns.ttl, (o.state = 6) AS active                     
-FROM vhffs_dns dns, vhffs_object o WHERE o.object_id=dns.object_id;
diff -Nru vhffs-542-nosvn/vhffs-backend/src/pgsql/initdb.sql.in vhffs-agh/vhffs-backend/src/pgsql/initdb.sql.in
--- vhffs-542-nosvn/vhffs-backend/src/pgsql/initdb.sql.in	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-backend/src/pgsql/initdb.sql.in	2007-04-06 18:32:52.000000000 +0200
@@ -0,0 +1,387 @@
+/*
+# Copyright (c) vhffs project and its contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without 
+# modification, are permitted provided that the following conditions 
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright 
+#   notice, this list of conditions and the following disclaimer.
+#2. Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in 
+#   the documentation and/or other materials provided with the 
+#   distribution.
+#3. Neither the name of vhffs nor the names of its contributors 
+#   may be used to endorse or promote products derived from this 
+#   software without specific prior written permission.
+#
+#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+# POSSIBILITY OF SUCH DAMAGE.
+*/	
+
+CREATE TABLE vhffs_object
+(
+	object_id serial,
+	owner_uid int4,
+	date_creation timestamp,
+	state int4 NOT NULL,
+	description TEXT,
+	type int4 DEFAULT 0,
+	CONSTRAINT vhffs_object_pkey PRIMARY KEY (object_id)
+) WITH OIDS;
+
+
+CREATE TABLE vhffs_acl
+(
+	acl_id serial,
+	oid_src int4,
+	perm int4 NOT NULL,
+	oid_dst int4 ,
+	CONSTRAINT vhffs_acl_pkey PRIMARY KEY (acl_id)
+) WITH OIDS;
+
+CREATE TABLE vhffs_groups
+(
+	gid serial,
+	groupname varchar(50) NOT NULL DEFAULT ' ',
+	passwd varchar(20),
+	quota int4 NOT NULL,
+	quota_used int4 NOT NULL DEFAULT 0,
+	object_id int4 NOT NULL,
+	owner_uid int4,
+	uid_mod int4,
+	CONSTRAINT vhffs_groups_pkey PRIMARY KEY (gid)
+) WITH OIDS;
+
+SELECT setval('vhffs_groups_gid_seq', @MINGID@);
+
+CREATE TABLE vhffs_users
+(
+	uid serial,
+	gid int4,
+	username varchar(50) NOT NULL DEFAULT ' ',
+	shell varchar(20) NOT NULL DEFAULT ' ',
+	passwd varchar(40) NOT NULL DEFAULT ' ',
+	homedir varchar(40) NOT NULL DEFAULT ' ',
+	admin int4 NOT NULL,
+	object_id int4 NOT NULL,
+	date_creation timestamp,
+	firstname varchar(250),
+	lastname varchar(250),
+	address text,
+	zipcode varchar(16),
+	city varchar(250),
+	country varchar(250),
+	mail varchar(200),
+	gpg_key varchar(250),
+	note int4 DEFAULT '0',
+	language varchar(16),
+	theme varchar(250),
+	CONSTRAINT vhffs_users_pkey PRIMARY KEY (uid)
+) WITH OIDS;
+
+SELECT setval('vhffs_users_uid_seq', @MINUID@) ;
+
+CREATE TABLE vhffs_boxes
+(
+	domain varchar,
+	local_part varchar,
+	domain_hash varchar NOT NULL,
+	password_hash varchar NOT NULL,
+	mbox_name varchar NOT NULL,
+	password varchar NOT NULL,
+	nospam boolean,
+	novirus boolean,
+	CONSTRAINT vhffs_boxes_pkey PRIMARY KEY (domain,local_part)
+) WITH OIDS;
+
+CREATE TABLE vhffs_cvs
+(
+	cvs_id serial,
+	cvsroot varchar NOT NULL,
+	owner_uid int4, 
+	owner_gid int4,
+	public boolean NOT NULL,
+	object_id int4,
+	CONSTRAINT vhffs_cvs_pkey PRIMARY KEY (cvs_id)
+) WITH OIDS;
+
+CREATE TABLE vhffs_dns
+(
+	dns_id serial,
+	domain varchar(255) NOT NULL,
+	owner_gid int4,
+	owner_uid int4,
+	object_id int4,
+	ns varchar(255) NOT NULL,
+	mbox varchar(255) NOT NULL,
+	serial INTEGER NOT NULL DEFAULT 1,
+	refresh INTEGER NOT NULL DEFAULT 28800,
+	retry INTEGER NOT NULL DEFAULT 7200,
+	expire INTEGER NOT NULL DEFAULT 604800,
+	minimum INTEGER NOT NULL DEFAULT 86400,
+	ttl INTEGER NOT NULL DEFAULT 86400,
+	CONSTRAINT vhffs_dns_pkey4 PRIMARY KEY (dns_id)
+) WITH OIDS;
+
+CREATE TABLE vhffs_dns_rr (
+	id serial,
+	zone INTEGER NOT NULL,
+	name varchar(64) NOT NULL,
+	type VARCHAR(5) NOT NULL,
+	data varchar(128) NOT NULL,
+	aux INTEGER NOT NULL DEFAULT 0,
+	ttl INTEGER NOT NULL DEFAULT 86400,
+	CONSTRAINT vhffs_dns_rr_pkey PRIMARY KEY (id)
+) WITH OIDS;	
+
+CREATE TABLE vhffs_forward
+(
+	domain varchar NOT NULL,
+	local_part varchar NOT NULL,
+	remote_name varchar NOT NULL,
+	password varchar NOT NULL,
+	CONSTRAINT vhffs_forward_pkey PRIMARY KEY (domain , local_part)
+) WITH OIDS;
+
+CREATE TABLE vhffs_httpd
+(
+	httpd_id serial,
+	servername varchar(200) NOT NULL DEFAULT ' ',
+	crawl int4 NOT NULL default '1',
+	owner_http int4 NOT NULL,
+	owner_rev int4 NOT NULL,
+	owner_uid int4,
+	owner_gid int4,
+	trafic int4 NOT NULL,
+	alert_state int4 NOT NULL default '0',
+	alert_limit int4 NOT NULL default '80',
+	object_id int4 NOT NULL,
+	CONSTRAINT vhffs_httpd_pkey PRIMARY KEY (httpd_id)
+) WITH OIDS;
+
+CREATE TABLE vhffs_repository
+(
+	repository_id serial,
+	name varchar NOT NULL,
+	owner_uid int4 NOT NULL,
+	owner_gid int4 NOT NULL,
+	quota int4 NOT NULL,
+	quota_used int4 NOT NULL DEFAULT 0,
+	object_id int4 NOT NULL,
+	CONSTRAINT vhffs_repository_pkey PRIMARY KEY (repository_id)
+) WITH OIDS;
+
+CREATE TABLE vhffs_mailings
+(
+	id_mailing serial,
+	subject VARCHAR NOT NULL,
+	message TEXT NOT NULL,
+	date timestamp,
+	state int4 NOT NULL,
+	CONSTRAINT vhffs_mailings_pkey PRIMARY KEY (id_mailing)
+) WITH OIDS;
+
+
+CREATE TABLE vhffs_mxdomain
+(
+	mxdomain_id serial,
+	domain varchar,
+	unix_user varchar NOT NULL,
+	boxes_path varchar NOT NULL,
+	max_popbox int4 NOT NULL,
+	catchall varchar NOT NULL,
+	owner_uid int4 NOT NULL,
+	owner_gid int4 NOT NULL,
+	object_id int4 NOT NULL,
+	CONSTRAINT vhffs_mxdomain_pkey PRIMARY KEY (mxdomain_id)
+) WITH OIDS;
+
+CREATE TABLE vhffs_ml
+(
+	ml_id serial,
+	local_part varchar(256) NOT NULL,
+	domain varchar(256),
+	prefix varchar(32),
+	owner_uid int4, 
+	owner_gid int4,
+	object_id int4,
+	admin varchar(250) NOT NULL,
+	sub_ctrl int4,
+	post_ctrl int4,
+	reply_to boolean,
+	open_archive boolean,
+	signature varchar(250),
+	CONSTRAINT vhffs_ml_pkey PRIMARY KEY (ml_id)
+) WITH OIDS;
+
+CREATE TABLE vhffs_ml_subscribers
+(
+	sub_id serial,
+	member varchar(256) NOT NULL,
+	perm int4 NOT NULL,
+	hash varchar,
+	ml_id int4 NOT NULL,
+	language varchar(16),
+	CONSTRAINT vhffs_ml_subscribers_pkey PRIMARY KEY (sub_id)
+) WITH OIDS;
+
+CREATE TABLE vhffs_mysql
+(
+	mysql_id serial,
+	dbname varchar(200) NOT NULL,
+	dbuser varchar(200) NOT NULL,
+	owner_uid int4, 
+	owner_gid int4,
+	dbpass VARCHAR(32) NOT NULL,
+	object_id int4,
+	CONSTRAINT vhffs_mysql_pkey PRIMARY KEY (mysql_id)
+) WITH OIDS;
+
+CREATE TABLE vhffs_history
+(
+	history_id serial,
+	object_id int4,
+	date timestamp,
+	message varchar(200),
+	CONSTRAINT vhffs_history_pkey PRIMARY KEY (history_id)
+) WITH OIDS;
+
+CREATE TABLE vhffs_pgsql
+(
+	pgsql_id serial,
+	dbname varchar(200) NOT NULL,
+	dbuser varchar(16) NOT NULL,
+	dbpass varchar(32) NOT NULL,
+	owner_uid int4, 
+	owner_gid int4,
+	object_id int4,
+	CONSTRAINT vhffs_pgsql_pkey PRIMARY KEY (pgsql_id)
+) WITH OIDS;
+
+CREATE TABLE vhffs_svn
+(
+	svn_id SERIAL,
+	reponame varchar NOT NULL,
+	owner_uid int4, 
+	owner_gid int4,
+	public int4 NOT NULL,
+	object_id int4,
+	CONSTRAINT vhffs_svn_pkey PRIMARY KEY( reponame , owner_gid)
+) WITH OIDS;
+
+CREATE TABLE vhffs_user_group
+(
+	uid int4 ,
+	gid int4 ,
+	state int4 ,
+	CONSTRAINT vhffs_user_group_pkey PRIMARY KEY (uid,gid)
+)WITH OIDS;
+
+
+/****** Indexes and unique constraints *******/
+ALTER TABLE vhffs_users ADD CONSTRAINT vhffs_users_unique_username UNIQUE (username);
+ALTER TABLE vhffs_groups ADD CONSTRAINT vhffs_groups_unique_groupname UNIQUE (groupname);
+ALTER TABLE vhffs_cvs ADD CONSTRAINT vhffs_cvs_unique_cvsroot UNIQUE (cvsroot);
+ALTER TABLE vhffs_httpd ADD CONSTRAINT vhffs_httpd_unique_servername UNIQUE (servername);
+ALTER TABLE vhffs_mxdomain ADD CONSTRAINT vhffs_mxdomain_unique_domainname UNIQUE (domain);
+ALTER TABLE vhffs_mysql ADD CONSTRAINT vhffs_mysql_unique_dbname UNIQUE (dbname);
+ALTER TABLE vhffs_mysql ADD CONSTRAINT vhffs_mysql_unique_dbuser UNIQUE (dbuser);
+ALTER TABLE vhffs_pgsql ADD CONSTRAINT vhffs_pgsql_unique_dbname UNIQUE (dbname);
+ALTER TABLE vhffs_pgsql ADD CONSTRAINT vhffs_pgsql_unique_dbuser UNIQUE (dbuser);
+ALTER TABLE vhffs_repository ADD CONSTRAINT vhffs_repository_unique_name UNIQUE (name);
+ALTER TABLE vhffs_svn ADD CONSTRAINT vhffs_svn_unique_reponame UNIQUE (reponame);
+ALTER TABLE vhffs_dns ADD CONSTRAINT vhffs_dns_unique_domain UNIQUE (domain);
+ALTER TABLE vhffs_ml ADD CONSTRAINT vhffs_ml_unique_address UNIQUE (local_part, domain);
+ALTER TABLE vhffs_ml_subscribers ADD CONSTRAINT vhffs_ml_subscribers_member_list UNIQUE (ml_id, member);
+
+-- This index drastically improves performances on get_used_letters
+CREATE INDEX idx_vhffs_httpd_servername_firstletter ON vhffs_httpd(substr(servername, 1, 1));
+-- state is massively used in WHERE clause, this index improves overall performances
+CREATE INDEX idx_vhffs_object_state ON vhffs_object(state);
+
+/****** Non primary key constraints.
+      Defining foreign keys here allow to create tables in any order.
+*******/
+
+ALTER TABLE vhffs_acl ADD CONSTRAINT fk_vhffs_acl_vhffs_object_dst FOREIGN KEY (oid_dst) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
+ALTER TABLE vhffs_acl ADD CONSTRAINT fk_vhffs_acl_vhffs_object_src FOREIGN KEY (oid_src) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
+
+ALTER TABLE vhffs_groups ADD CONSTRAINT fk_vhffs_group_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
+ALTER TABLE vhffs_groups ADD CONSTRAINT fk_vhffs_group_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users (uid);
+
+ALTER TABLE vhffs_users ADD CONSTRAINT fk_vhffs_users_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object (object_id) ON DELETE CASCADE;
+
+ALTER TABLE vhffs_cvs ADD CONSTRAINT fk_vhffs_cvs_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
+ALTER TABLE vhffs_cvs ADD CONSTRAINT fk_vhffs_cvs_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
+ALTER TABLE vhffs_cvs ADD CONSTRAINT fk_vhffs_cvs_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
+
+ALTER TABLE vhffs_dns ADD CONSTRAINT fk_vhffs_dns_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
+ALTER TABLE vhffs_dns ADD CONSTRAINT fk_vhffs_dns_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
+ALTER TABLE vhffs_dns ADD CONSTRAINT fk_vhffs_dns_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
+
+ALTER TABLE vhffs_dns_rr ADD CONSTRAINT fk_vhffs_dns_rr_vhffs_dns FOREIGN KEY (zone) REFERENCES vhffs_dns(dns_id) ON DELETE CASCADE;
+ALTER TABLE vhffs_dns_rr ADD CONSTRAINT fk_vhffs_dns_rr_chk_type CHECK (type='A' OR type='AAAA' OR type='CNAME' OR type='HINFO' OR type='MX' OR type='NS' OR type='PTR' OR type='RP' OR type='SRV' OR type='TXT');
+
+ALTER TABLE vhffs_httpd ADD CONSTRAINT fk_vhffs_httpd_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
+ALTER TABLE vhffs_httpd ADD CONSTRAINT fk_vhffs_httpd_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
+
+ALTER TABLE vhffs_repository ADD CONSTRAINT fk_vhffs_vhffs_repository_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
+ALTER TABLE vhffs_repository ADD CONSTRAINT fk_vhffs_vhffs_repository_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
+ALTER TABLE vhffs_repository ADD CONSTRAINT fk_vhffs_vhffs_repository_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
+
+ALTER TABLE vhffs_mxdomain ADD CONSTRAINT fk_vhffs_mxdomain_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
+ALTER TABLE vhffs_mxdomain ADD CONSTRAINT fk_vhffs_mxdomain_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
+ALTER TABLE vhffs_mxdomain ADD CONSTRAINT fk_vhffs_mxdomain_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
+
+ALTER TABLE vhffs_ml ADD CONSTRAINT fk_vhffs_ml_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
+ALTER TABLE vhffs_ml ADD CONSTRAINT fk_vhffs_ml_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
+ALTER TABLE vhffs_ml ADD CONSTRAINT fk_vhffs_ml_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
+
+ALTER TABLE vhffs_ml_subscribers ADD CONSTRAINT fk_vhffs_ml_subscribers_vhffs_ml FOREIGN KEY (ml_id) REFERENCES vhffs_ml(ml_id) ON DELETE CASCADE;
+
+ALTER TABLE vhffs_mysql ADD CONSTRAINT fk_vhffs_mysql_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
+ALTER TABLE vhffs_mysql ADD CONSTRAINT fk_vhffs_mysql_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
+ALTER TABLE vhffs_mysql ADD CONSTRAINT fk_vhffs_mysql_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
+
+ALTER TABLE vhffs_history ADD CONSTRAINT fk_vhffs_history_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
+
+ALTER TABLE vhffs_pgsql ADD CONSTRAINT fk_vhffs_pgsql_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
+ALTER TABLE vhffs_pgsql ADD CONSTRAINT fk_vhffs_pgsql_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
+ALTER TABLE vhffs_pgsql ADD CONSTRAINT fk_vhffs_pgsql_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
+
+ALTER TABLE vhffs_svn ADD CONSTRAINT fk_vhffs_svn_vhffs_users FOREIGN KEY (owner_uid) REFERENCES vhffs_users(uid);
+ALTER TABLE vhffs_svn ADD CONSTRAINT fk_vhffs_svn_vhffs_groups FOREIGN KEY (owner_gid) REFERENCES vhffs_groups(gid);
+ALTER TABLE vhffs_svn ADD CONSTRAINT fk_vhffs_svn_vhffs_object FOREIGN KEY (object_id) REFERENCES vhffs_object(object_id) ON DELETE CASCADE;
+
+ALTER TABLE vhffs_user_group ADD CONSTRAINT fk_vhffs_user_group_vhffs_users FOREIGN KEY (uid) REFERENCES vhffs_users (uid) ON DELETE CASCADE;
+ALTER TABLE vhffs_user_group ADD CONSTRAINT fk_vhffs_user_group_vhffs_groups FOREIGN KEY (gid) REFERENCES vhffs_groups (gid) ON DELETE CASCADE;
+
+
+CREATE VIEW vhffs_passwd AS
+SELECT uid, gid, username, shell, '*'::character varying AS passwd, homedir
+FROM vhffs_users;
+
+CREATE VIEW vhffs_shadow AS
+SELECT uid, gid, username, shell, passwd, '0'::int4 as newtok , '0'::int4 as expired , homedir
+FROM vhffs_users;
+
+CREATE VIEW vhffs_forum AS
+SELECT users.username, users.passwd, users.firstname, users.lastname, users.mail, users.date_creation, object.state
+FROM vhffs_users users, vhffs_object object
+WHERE object.object_id=users.object_id;
+
+CREATE VIEW vhffs_dns_soa AS
+SELECT dns.dns_id AS id, dns.domain || '.' AS origin , dns.ns, dns.mbox, dns.serial, dns.refresh, dns.retry, dns.expire, dns.minimum, dns.ttl, (o.state = 6) AS active                     
+FROM vhffs_dns dns, vhffs_object o WHERE o.object_id=dns.object_id;
diff -Nru vhffs-542-nosvn/vhffs-compat/4.0.sql vhffs-agh/vhffs-compat/4.0.sql
--- vhffs-542-nosvn/vhffs-compat/4.0.sql	2007-04-03 21:24:44.000000000 +0200
+++ vhffs-agh/vhffs-compat/4.0.sql	1970-01-01 01:00:00.000000000 +0100
@@ -1,214 +0,0 @@
--- OK, we try to minimize risks by setting sequences' current values to
--- the greatest id. Ideally, vhffs should be stopped during upgrade
-
-SELECT setval('vhffs_object_object_id_seq', (SELECT COALESCE(MAX(object_id), 1) FROM vhffs_object));
-SELECT setval('vhffs_acl_acl_id_seq', (SELECT COALESCE(MAX(acl_id), 1) FROM vhffs_acl));
--- **** Change 10000 to your former min_gid
--- TODO : handle it in the installer
-SELECT setval('vhffs_groups_gid_seq', (SELECT COALESCE(MAX(gid), 10000) FROM vhffs_groups));
--- TODO : same as above but for uid
-SELECT setval('vhffs_users_uid_seq', (SELECT COALESCE(MAX(uid), 10000) FROM vhffs_users));
-SELECT setval('vhffs_confirmation_cid_seq', (SELECT COALESCE(MAX(cid), 1) FROM vhffs_confirmation));
-SELECT setval('vhffs_cvs_cvs_id_seq', (SELECT COALESCE(MAX(cvs_id), 1) FROM vhffs_cvs));
-SELECT setval('vhffs_dns_dns_id_seq', (SELECT COALESCE(MAX(dns_id), 1) FROM vhffs_dns));
-SELECT setval('vhffs_dns_rr_id_seq', (SELECT COALESCE(MAX(id), 1) FROM vhffs_dns_rr));
-SELECT setval('vhffs_httpd_httpd_id_seq', (SELECT COALESCE(MAX(httpd_id), 1) FROM vhffs_httpd));
-SELECT setval('vhffs_mailings_id_mailing_seq', (SELECT COALESCE(MAX(id_mailing), 1) FROM vhffs_mailings));
-SELECT setval('vhffs_mxdomain_mxdomain_id_seq', (SELECT COALESCE(MAX(mxdomain_id), 1) FROM vhffs_mxdomain));
-SELECT setval('vhffs_ml_ml_id_seq', (SELECT COALESCE(MAX(ml_id), 1) FROM vhffs_ml));
-SELECT setval('vhffs_mysql_mysql_id_seq', (SELECT COALESCE(MAX(mysql_id), 1) FROM vhffs_mysql));
-SELECT setval('vhffs_history_history_id_seq', (SELECT COALESCE(MAX(history_id), 1) FROM vhffs_history));
-SELECT setval('vhffs_pgsql_pgsql_id_seq', (SELECT COALESCE(MAX(pgsql_id), 1) FROM vhffs_pgsql));
-SELECT setval('vhffs_repository_repository_id_seq', (SELECT COALESCE(MAX(repository_id), 1) FROM vhffs_repository));
-SELECT setval('vhffs_svn_svn_id_seq', (SELECT COALESCE(MAX(svn_id), 1) FROM vhffs_svn));
-
-ALTER TABLE vhffs_object ALTER owner_uid DROP NOT NULL;
-ALTER TABLE vhffs_users ALTER gid DROP NOT NULL;
-
-DROP TABLE vhffs_largefile CASCADE;
-DROP TABLE vhffs_confirmation CASCADE;
-
--- add a column named "type" on object table in order to know the purpose of the object (web area, mysql, ...)
--- existing types: unassigned[0], user[10], group[11], httpd[20], repository[21], mysql[30], pgsql[31], cvs[40], svn[41], dns[50], mail[60], ml[61]
--- Pg 7.4 doesn't support default value in add column !
-ALTER TABLE vhffs_object ADD COLUMN type int4;
-ALTER TABLE vhffs_object ALTER COLUMN type SET DEFAULT 0;
--- This *shouldn't be necessary since every object has a type but some old code
--- didn't perform correct cleanup
-UPDATE vhffs_object SET type=0;
-
-UPDATE vhffs_object SET type=10 WHERE object_id IN (SELECT object_id FROM vhffs_users);
-UPDATE vhffs_object SET type=11 WHERE object_id IN (SELECT object_id FROM vhffs_groups);
-UPDATE vhffs_object SET type=20 WHERE object_id IN (SELECT object_id FROM vhffs_httpd);
-UPDATE vhffs_object SET type=21 WHERE object_id IN (SELECT object_id FROM vhffs_repository);
-UPDATE vhffs_object SET type=30 WHERE object_id IN (SELECT object_id FROM vhffs_mysql);
-UPDATE vhffs_object SET type=31 WHERE object_id IN (SELECT object_id FROM vhffs_pgsql);
-UPDATE vhffs_object SET type=40 WHERE object_id IN (SELECT object_id FROM vhffs_cvs);
-UPDATE vhffs_object SET type=41 WHERE object_id IN (SELECT object_id FROM vhffs_svn);
-UPDATE vhffs_object SET type=50 WHERE object_id IN (SELECT object_id FROM vhffs_dns_global);
-UPDATE vhffs_object SET type=60 WHERE object_id IN (SELECT object_id FROM vhffs_mxdomain);
-UPDATE vhffs_object SET type=61 WHERE object_id IN (SELECT object_id FROM vhffs_ml);
-
--- cleanup unused objects
-DELETE FROM vhffs_object WHERE type='0';
-
--- merge vhffs_user_info to vhffs_users
-ALTER TABLE vhffs_users ADD COLUMN date_creation timestamp;
-ALTER TABLE vhffs_users ADD COLUMN firstname varchar(250);
-ALTER TABLE vhffs_users ADD COLUMN lastname varchar(250);
-ALTER TABLE vhffs_users ADD COLUMN address text;
-ALTER TABLE vhffs_users ADD COLUMN zipcode varchar(16);
-ALTER TABLE vhffs_users ADD COLUMN city varchar(250);
-ALTER TABLE vhffs_users ADD COLUMN country varchar(250);
-ALTER TABLE vhffs_users ADD COLUMN mail varchar(200);
-ALTER TABLE vhffs_users ADD COLUMN gpg_key varchar(250);
-
-UPDATE vhffs_users SET date_creation = ui.date_creation, firstname = ui.firstname, lastname = ui.lastname,
-       address = ui.address, zipcode = ui.zipcode, city = ui.city, country = ui.country, mail = ui.mail,
-       gpg_key = ui.gpg_key
-    FROM vhffs_user_info ui
-    WHERE ui.uid = vhffs_users.uid;
-
--- DROP TABLE vhffs_user_info;
-
--- merge vhffs_notes to vhffs_users
-ALTER TABLE vhffs_users ADD COLUMN note int4;
-UPDATE vhffs_users SET note = 0 WHERE object_id NOT IN (SELECT object_id FROM vhffs_notes);
-UPDATE vhffs_users SET note = n.note FROM vhffs_notes n WHERE n.object_id = vhffs_users.object_id;
-
--- DROP TABLE vhffs_notes;
-
--- merge vhffs_panel_user_prefs to vhffs_users
-ALTER TABLE vhffs_users ADD COLUMN language varchar(16);
-ALTER TABLE vhffs_users ADD COLUMN theme varchar(250);
--- Not all users have a language and a theme set in vhffs_panel_user_prefs
-UPDATE vhffs_users SET language = 'en_US', theme = 'default';
-UPDATE vhffs_users SET language = up.language, theme = up.theme
-    FROM vhffs_panel_user_prefs up
-    WHERE up.uid = vhffs_users.uid;
-
--- DROP TABLE vhffs_panel_user_prefs;
-
--- merge vhffs_groups_info to vhffs_groups
-ALTER TABLE vhffs_groups ADD COLUMN owner_uid int4;
-ALTER TABLE vhffs_groups ADD COLUMN uid_mod int4;
-UPDATE vhffs_groups SET owner_uid = gi.owner_uid, uid_mod = gi.uid_mod
-    FROM vhffs_groups_info gi
-    WHERE gi.gid = vhffs_groups.gid;
-
--- DROP TABLE vhffs_groups_info;
-
--- merge vhffs_ml_prefs to vhffs_ml
-ALTER TABLE vhffs_ml ADD COLUMN admin varchar(250);
-ALTER TABLE vhffs_ml ADD COLUMN open_post boolean;
-ALTER TABLE vhffs_ml ADD COLUMN open_archive boolean;
-ALTER TABLE vhffs_ml ADD COLUMN open_sub boolean;
-ALTER TABLE vhffs_ml ADD COLUMN reply_to boolean;
-ALTER TABLE vhffs_ml ADD COLUMN moderated boolean;
-
-UPDATE vhffs_ml SET admin = mlp.admin,
-    open_post = (mlp.open_post != 0),
-    open_archive = (mlp.open_archive != 0),
-    open_sub = (mlp.open_sub != 0),
-    reply_to = (mlp.reply_to != 0),
-    moderated = (mlp.moderated != 0)
-    FROM vhffs_ml_prefs mlp
-    WHERE mlp.ml_id = vhffs_ml.ml_id;
-
--- DROP TABLE vhffs_ml_prefs;
-
-ALTER TABLE vhffs_ml DROP url;
-ALTER TABLE vhffs_ml ADD COLUMN signature varchar(250);
-
-
--- merge vhffs_ml_lang to vhffs_ml_subscribers
-ALTER TABLE vhffs_ml_subscribers ADD COLUMN language varchar(16);
-UPDATE vhffs_ml_subscribers SET language = mll.lang FROM vhffs_ml_lang mll WHERE mll.member = vhffs_ml_subscribers.member;
-
--- DROP TABLE vhffs_ml_lang;
-
-ALTER TABLE vhffs_ml_subscribers DROP active;
-ALTER TABLE vhffs_ml_subscribers ALTER COLUMN hash DROP NOT NULL;
-
-
--- modify vhffs_ml, drop columns open_post, open_sub, moderated, replace by sub_ctrl and mod_ctrl
---   sub_ctrl, 0 = open, 1 = open but moderated (approval required), 2 = closed
---   post_ctrl, 0 = open, 1 = moderated for all, 2 = moderated for non members and open for members, 3 = members only,
---              4 = members only and moderated, 5 = admins only
-ALTER TABLE vhffs_ml ADD COLUMN sub_ctrl int4;
-ALTER TABLE vhffs_ml ADD COLUMN post_ctrl int4;
-UPDATE vhffs_ml SET sub_ctrl = 0;
-UPDATE vhffs_ml SET sub_ctrl = 0 where open_sub = 't';
-UPDATE vhffs_ml SET sub_ctrl = 2 where open_sub = 'f';
-UPDATE vhffs_ml SET post_ctrl = 0;
-UPDATE vhffs_ml SET post_ctrl = 0 where open_post = 't' and moderated = 'f';
-UPDATE vhffs_ml SET post_ctrl = 1 where open_post = 't' and moderated = 't';
-UPDATE vhffs_ml SET post_ctrl = 3 where open_post = 'f' and moderated = 'f';
-UPDATE vhffs_ml SET post_ctrl = 4 where open_post = 'f' and moderated = 't';
-ALTER TABLE vhffs_ml DROP COLUMN open_sub;
-ALTER TABLE vhffs_ml DROP COLUMN open_post;
-ALTER TABLE vhffs_ml DROP COLUMN moderated;
-
-
--- rename vhffs_dns_global to vhffs_dns
-ALTER TABLE vhffs_dns_global RENAME TO vhffs_dns;
-
--- merge vhffs_dns_soa to vhffs_dns(ex vhffs_dns_global)
-ALTER TABLE vhffs_dns ADD COLUMN ns varchar(255);
-
-ALTER TABLE vhffs_dns ADD COLUMN mbox varchar(255);
-
-ALTER TABLE vhffs_dns ADD COLUMN serial INTEGER;
-ALTER TABLE vhffs_dns ALTER COLUMN serial SET DEFAULT 1;
-
-ALTER TABLE vhffs_dns ADD COLUMN refresh INTEGER;
-ALTER TABLE vhffs_dns ALTER COLUMN refresh SET DEFAULT 28800;
-
-ALTER TABLE vhffs_dns ADD COLUMN retry INTEGER;
-ALTER TABLE vhffs_dns ALTER COLUMN retry SET DEFAULT 7200;
-
-ALTER TABLE vhffs_dns ADD COLUMN expire INTEGER;
-ALTER TABLE vhffs_dns ALTER COLUMN expire SET DEFAULT 604800;
-
-ALTER TABLE vhffs_dns ADD COLUMN minimum INTEGER;
-ALTER TABLE vhffs_dns ALTER COLUMN minimum SET DEFAULT 86400;
-
-ALTER TABLE vhffs_dns ADD COLUMN ttl INTEGER;
-ALTER TABLE vhffs_dns ALTER COLUMN ttl SET DEFAULT 86400;
-
-UPDATE vhffs_dns SET ns = soa.ns, mbox = soa.mbox, serial = soa.serial, refresh = soa.refresh, retry = soa.retry,
-    expire = soa.expire, minimum = soa.minimum, ttl = soa.ttl
-    FROM vhffs_dns_soa soa
-    WHERE soa.id = vhffs_dns.dns_id;
-    
-ALTER TABLE vhffs_dns ALTER COLUMN ns SET NOT NULL;
-ALTER TABLE vhffs_dns ALTER COLUMN mbox SET NOT NULL;
-ALTER TABLE vhffs_dns ALTER COLUMN serial SET NOT NULL;
-ALTER TABLE vhffs_dns ALTER COLUMN refresh SET NOT NULL;
-ALTER TABLE vhffs_dns ALTER COLUMN retry SET NOT NULL;
-ALTER TABLE vhffs_dns ALTER COLUMN expire SET NOT NULL;
-ALTER TABLE vhffs_dns ALTER COLUMN minimum SET NOT NULL;
-ALTER TABLE vhffs_dns ALTER COLUMN ttl SET NOT NULL;
-
--- DROP TABLE vhffs_dns_soa;
-
--- change the type of vhffs_object.state from varchar to int4 ..... (no comments allowed please)
-BEGIN;
-ALTER TABLE vhffs_object ADD COLUMN state_new int4;
-UPDATE vhffs_object SET state_new = state::text::integer;
-ALTER TABLE vhffs_object DROP COLUMN state CASCADE;
-ALTER TABLE vhffs_object RENAME COLUMN state_new TO state;
-ALTER TABLE vhffs_object ALTER COLUMN state SET NOT NULL;
-COMMIT;
-
--- create vhffs_dns_soa view
-CREATE VIEW vhffs_dns_soa AS
-SELECT dns.dns_id AS id, dns.domain || '.' AS origin , dns.ns, dns.mbox, dns.serial, dns.refresh, dns.retry, dns.expire, dns.minimum, dns.ttl, (o.state = 6) AS active
-FROM vhffs_dns dns, vhffs_object o WHERE o.object_id=dns.object_id;
-
--- update vhffs_forum view, it has been dropped by drop column state in vhffs_object
-CREATE VIEW vhffs_forum AS
-SELECT users.username, users.passwd, users.firstname, users.lastname, users.mail, users.date_creation, object.state
-FROM vhffs_users users, vhffs_object object
-WHERE object.object_id=users.object_id;
-
diff -Nru vhffs-542-nosvn/vhffs-compat/4.0.sql.in vhffs-agh/vhffs-compat/4.0.sql.in
--- vhffs-542-nosvn/vhffs-compat/4.0.sql.in	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-compat/4.0.sql.in	2007-04-06 18:14:25.000000000 +0200
@@ -0,0 +1,211 @@
+-- OK, we try to minimize risks by setting sequences' current values to
+-- the greatest id. Ideally, vhffs should be stopped during upgrade
+
+SELECT setval('vhffs_object_object_id_seq', (SELECT COALESCE(MAX(object_id), 1) FROM vhffs_object));
+SELECT setval('vhffs_acl_acl_id_seq', (SELECT COALESCE(MAX(acl_id), 1) FROM vhffs_acl));
+SELECT setval('vhffs_groups_gid_seq', (SELECT COALESCE(MAX(gid), @MINGID@) FROM vhffs_groups));
+SELECT setval('vhffs_users_uid_seq', (SELECT COALESCE(MAX(uid), @MINUID@) FROM vhffs_users));
+SELECT setval('vhffs_confirmation_cid_seq', (SELECT COALESCE(MAX(cid), 1) FROM vhffs_confirmation));
+SELECT setval('vhffs_cvs_cvs_id_seq', (SELECT COALESCE(MAX(cvs_id), 1) FROM vhffs_cvs));
+SELECT setval('vhffs_dns_dns_id_seq', (SELECT COALESCE(MAX(dns_id), 1) FROM vhffs_dns));
+SELECT setval('vhffs_dns_rr_id_seq', (SELECT COALESCE(MAX(id), 1) FROM vhffs_dns_rr));
+SELECT setval('vhffs_httpd_httpd_id_seq', (SELECT COALESCE(MAX(httpd_id), 1) FROM vhffs_httpd));
+SELECT setval('vhffs_mailings_id_mailing_seq', (SELECT COALESCE(MAX(id_mailing), 1) FROM vhffs_mailings));
+SELECT setval('vhffs_mxdomain_mxdomain_id_seq', (SELECT COALESCE(MAX(mxdomain_id), 1) FROM vhffs_mxdomain));
+SELECT setval('vhffs_ml_ml_id_seq', (SELECT COALESCE(MAX(ml_id), 1) FROM vhffs_ml));
+SELECT setval('vhffs_mysql_mysql_id_seq', (SELECT COALESCE(MAX(mysql_id), 1) FROM vhffs_mysql));
+SELECT setval('vhffs_history_history_id_seq', (SELECT COALESCE(MAX(history_id), 1) FROM vhffs_history));
+SELECT setval('vhffs_pgsql_pgsql_id_seq', (SELECT COALESCE(MAX(pgsql_id), 1) FROM vhffs_pgsql));
+SELECT setval('vhffs_repository_repository_id_seq', (SELECT COALESCE(MAX(repository_id), 1) FROM vhffs_repository));
+SELECT setval('vhffs_svn_svn_id_seq', (SELECT COALESCE(MAX(svn_id), 1) FROM vhffs_svn));
+
+ALTER TABLE vhffs_object ALTER owner_uid DROP NOT NULL;
+ALTER TABLE vhffs_users ALTER gid DROP NOT NULL;
+
+DROP TABLE vhffs_largefile CASCADE;
+DROP TABLE vhffs_confirmation CASCADE;
+
+-- add a column named "type" on object table in order to know the purpose of the object (web area, mysql, ...)
+-- existing types: unassigned[0], user[10], group[11], httpd[20], repository[21], mysql[30], pgsql[31], cvs[40], svn[41], dns[50], mail[60], ml[61]
+-- Pg 7.4 doesn't support default value in add column !
+ALTER TABLE vhffs_object ADD COLUMN type int4;
+ALTER TABLE vhffs_object ALTER COLUMN type SET DEFAULT 0;
+-- This *shouldn't be necessary since every object has a type but some old code
+-- didn't perform correct cleanup
+UPDATE vhffs_object SET type=0;
+
+UPDATE vhffs_object SET type=10 WHERE object_id IN (SELECT object_id FROM vhffs_users);
+UPDATE vhffs_object SET type=11 WHERE object_id IN (SELECT object_id FROM vhffs_groups);
+UPDATE vhffs_object SET type=20 WHERE object_id IN (SELECT object_id FROM vhffs_httpd);
+UPDATE vhffs_object SET type=21 WHERE object_id IN (SELECT object_id FROM vhffs_repository);
+UPDATE vhffs_object SET type=30 WHERE object_id IN (SELECT object_id FROM vhffs_mysql);
+UPDATE vhffs_object SET type=31 WHERE object_id IN (SELECT object_id FROM vhffs_pgsql);
+UPDATE vhffs_object SET type=40 WHERE object_id IN (SELECT object_id FROM vhffs_cvs);
+UPDATE vhffs_object SET type=41 WHERE object_id IN (SELECT object_id FROM vhffs_svn);
+UPDATE vhffs_object SET type=50 WHERE object_id IN (SELECT object_id FROM vhffs_dns_global);
+UPDATE vhffs_object SET type=60 WHERE object_id IN (SELECT object_id FROM vhffs_mxdomain);
+UPDATE vhffs_object SET type=61 WHERE object_id IN (SELECT object_id FROM vhffs_ml);
+
+-- cleanup unused objects
+DELETE FROM vhffs_object WHERE type='0';
+
+-- merge vhffs_user_info to vhffs_users
+ALTER TABLE vhffs_users ADD COLUMN date_creation timestamp;
+ALTER TABLE vhffs_users ADD COLUMN firstname varchar(250);
+ALTER TABLE vhffs_users ADD COLUMN lastname varchar(250);
+ALTER TABLE vhffs_users ADD COLUMN address text;
+ALTER TABLE vhffs_users ADD COLUMN zipcode varchar(16);
+ALTER TABLE vhffs_users ADD COLUMN city varchar(250);
+ALTER TABLE vhffs_users ADD COLUMN country varchar(250);
+ALTER TABLE vhffs_users ADD COLUMN mail varchar(200);
+ALTER TABLE vhffs_users ADD COLUMN gpg_key varchar(250);
+
+UPDATE vhffs_users SET date_creation = ui.date_creation, firstname = ui.firstname, lastname = ui.lastname,
+       address = ui.address, zipcode = ui.zipcode, city = ui.city, country = ui.country, mail = ui.mail,
+       gpg_key = ui.gpg_key
+    FROM vhffs_user_info ui
+    WHERE ui.uid = vhffs_users.uid;
+
+-- DROP TABLE vhffs_user_info;
+
+-- merge vhffs_notes to vhffs_users
+ALTER TABLE vhffs_users ADD COLUMN note int4;
+UPDATE vhffs_users SET note = 0 WHERE object_id NOT IN (SELECT object_id FROM vhffs_notes);
+UPDATE vhffs_users SET note = n.note FROM vhffs_notes n WHERE n.object_id = vhffs_users.object_id;
+
+-- DROP TABLE vhffs_notes;
+
+-- merge vhffs_panel_user_prefs to vhffs_users
+ALTER TABLE vhffs_users ADD COLUMN language varchar(16);
+ALTER TABLE vhffs_users ADD COLUMN theme varchar(250);
+-- Not all users have a language and a theme set in vhffs_panel_user_prefs
+UPDATE vhffs_users SET language = 'en_US', theme = 'default';
+UPDATE vhffs_users SET language = up.language, theme = up.theme
+    FROM vhffs_panel_user_prefs up
+    WHERE up.uid = vhffs_users.uid;
+
+-- DROP TABLE vhffs_panel_user_prefs;
+
+-- merge vhffs_groups_info to vhffs_groups
+ALTER TABLE vhffs_groups ADD COLUMN owner_uid int4;
+ALTER TABLE vhffs_groups ADD COLUMN uid_mod int4;
+UPDATE vhffs_groups SET owner_uid = gi.owner_uid, uid_mod = gi.uid_mod
+    FROM vhffs_groups_info gi
+    WHERE gi.gid = vhffs_groups.gid;
+
+-- DROP TABLE vhffs_groups_info;
+
+-- merge vhffs_ml_prefs to vhffs_ml
+ALTER TABLE vhffs_ml ADD COLUMN admin varchar(250);
+ALTER TABLE vhffs_ml ADD COLUMN open_post boolean;
+ALTER TABLE vhffs_ml ADD COLUMN open_archive boolean;
+ALTER TABLE vhffs_ml ADD COLUMN open_sub boolean;
+ALTER TABLE vhffs_ml ADD COLUMN reply_to boolean;
+ALTER TABLE vhffs_ml ADD COLUMN moderated boolean;
+
+UPDATE vhffs_ml SET admin = mlp.admin,
+    open_post = (mlp.open_post != 0),
+    open_archive = (mlp.open_archive != 0),
+    open_sub = (mlp.open_sub != 0),
+    reply_to = (mlp.reply_to != 0),
+    moderated = (mlp.moderated != 0)
+    FROM vhffs_ml_prefs mlp
+    WHERE mlp.ml_id = vhffs_ml.ml_id;
+
+-- DROP TABLE vhffs_ml_prefs;
+
+ALTER TABLE vhffs_ml DROP url;
+ALTER TABLE vhffs_ml ADD COLUMN signature varchar(250);
+
+
+-- merge vhffs_ml_lang to vhffs_ml_subscribers
+ALTER TABLE vhffs_ml_subscribers ADD COLUMN language varchar(16);
+UPDATE vhffs_ml_subscribers SET language = mll.lang FROM vhffs_ml_lang mll WHERE mll.member = vhffs_ml_subscribers.member;
+
+-- DROP TABLE vhffs_ml_lang;
+
+ALTER TABLE vhffs_ml_subscribers DROP active;
+ALTER TABLE vhffs_ml_subscribers ALTER COLUMN hash DROP NOT NULL;
+
+
+-- modify vhffs_ml, drop columns open_post, open_sub, moderated, replace by sub_ctrl and mod_ctrl
+--   sub_ctrl, 0 = open, 1 = open but moderated (approval required), 2 = closed
+--   post_ctrl, 0 = open, 1 = moderated for all, 2 = moderated for non members and open for members, 3 = members only,
+--              4 = members only and moderated, 5 = admins only
+ALTER TABLE vhffs_ml ADD COLUMN sub_ctrl int4;
+ALTER TABLE vhffs_ml ADD COLUMN post_ctrl int4;
+UPDATE vhffs_ml SET sub_ctrl = 0;
+UPDATE vhffs_ml SET sub_ctrl = 0 where open_sub = 't';
+UPDATE vhffs_ml SET sub_ctrl = 2 where open_sub = 'f';
+UPDATE vhffs_ml SET post_ctrl = 0;
+UPDATE vhffs_ml SET post_ctrl = 0 where open_post = 't' and moderated = 'f';
+UPDATE vhffs_ml SET post_ctrl = 1 where open_post = 't' and moderated = 't';
+UPDATE vhffs_ml SET post_ctrl = 3 where open_post = 'f' and moderated = 'f';
+UPDATE vhffs_ml SET post_ctrl = 4 where open_post = 'f' and moderated = 't';
+ALTER TABLE vhffs_ml DROP COLUMN open_sub;
+ALTER TABLE vhffs_ml DROP COLUMN open_post;
+ALTER TABLE vhffs_ml DROP COLUMN moderated;
+
+
+-- rename vhffs_dns_global to vhffs_dns
+ALTER TABLE vhffs_dns_global RENAME TO vhffs_dns;
+
+-- merge vhffs_dns_soa to vhffs_dns(ex vhffs_dns_global)
+ALTER TABLE vhffs_dns ADD COLUMN ns varchar(255);
+
+ALTER TABLE vhffs_dns ADD COLUMN mbox varchar(255);
+
+ALTER TABLE vhffs_dns ADD COLUMN serial INTEGER;
+ALTER TABLE vhffs_dns ALTER COLUMN serial SET DEFAULT 1;
+
+ALTER TABLE vhffs_dns ADD COLUMN refresh INTEGER;
+ALTER TABLE vhffs_dns ALTER COLUMN refresh SET DEFAULT 28800;
+
+ALTER TABLE vhffs_dns ADD COLUMN retry INTEGER;
+ALTER TABLE vhffs_dns ALTER COLUMN retry SET DEFAULT 7200;
+
+ALTER TABLE vhffs_dns ADD COLUMN expire INTEGER;
+ALTER TABLE vhffs_dns ALTER COLUMN expire SET DEFAULT 604800;
+
+ALTER TABLE vhffs_dns ADD COLUMN minimum INTEGER;
+ALTER TABLE vhffs_dns ALTER COLUMN minimum SET DEFAULT 86400;
+
+ALTER TABLE vhffs_dns ADD COLUMN ttl INTEGER;
+ALTER TABLE vhffs_dns ALTER COLUMN ttl SET DEFAULT 86400;
+
+UPDATE vhffs_dns SET ns = soa.ns, mbox = soa.mbox, serial = soa.serial, refresh = soa.refresh, retry = soa.retry,
+    expire = soa.expire, minimum = soa.minimum, ttl = soa.ttl
+    FROM vhffs_dns_soa soa
+    WHERE soa.id = vhffs_dns.dns_id;
+    
+ALTER TABLE vhffs_dns ALTER COLUMN ns SET NOT NULL;
+ALTER TABLE vhffs_dns ALTER COLUMN mbox SET NOT NULL;
+ALTER TABLE vhffs_dns ALTER COLUMN serial SET NOT NULL;
+ALTER TABLE vhffs_dns ALTER COLUMN refresh SET NOT NULL;
+ALTER TABLE vhffs_dns ALTER COLUMN retry SET NOT NULL;
+ALTER TABLE vhffs_dns ALTER COLUMN expire SET NOT NULL;
+ALTER TABLE vhffs_dns ALTER COLUMN minimum SET NOT NULL;
+ALTER TABLE vhffs_dns ALTER COLUMN ttl SET NOT NULL;
+
+-- DROP TABLE vhffs_dns_soa;
+
+-- change the type of vhffs_object.state from varchar to int4 ..... (no comments allowed please)
+BEGIN;
+ALTER TABLE vhffs_object ADD COLUMN state_new int4;
+UPDATE vhffs_object SET state_new = state::text::integer;
+ALTER TABLE vhffs_object DROP COLUMN state CASCADE;
+ALTER TABLE vhffs_object RENAME COLUMN state_new TO state;
+ALTER TABLE vhffs_object ALTER COLUMN state SET NOT NULL;
+COMMIT;
+
+-- create vhffs_dns_soa view
+CREATE VIEW vhffs_dns_soa AS
+SELECT dns.dns_id AS id, dns.domain || '.' AS origin , dns.ns, dns.mbox, dns.serial, dns.refresh, dns.retry, dns.expire, dns.minimum, dns.ttl, (o.state = 6) AS active
+FROM vhffs_dns dns, vhffs_object o WHERE o.object_id=dns.object_id;
+
+-- update vhffs_forum view, it has been dropped by drop column state in vhffs_object
+CREATE VIEW vhffs_forum AS
+SELECT users.username, users.passwd, users.firstname, users.lastname, users.mail, users.date_creation, object.state
+FROM vhffs_users users, vhffs_object object
+WHERE object.object_id=users.object_id;
+
diff -Nru vhffs-542-nosvn/vhffs-compat/updatedb.pl vhffs-agh/vhffs-compat/updatedb.pl
--- vhffs-542-nosvn/vhffs-compat/updatedb.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-compat/updatedb.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-doc/Makefile.am vhffs-agh/vhffs-doc/Makefile.am
--- vhffs-542-nosvn/vhffs-doc/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-doc/Makefile.am	2007-03-28 19:32:33.000000000 +0200
@@ -0,0 +1,17 @@
+EXTRA_DIST = api config debian
+docdir = @DOCDIR@
+
+doc_DATA = \
+	Architecture-fr \
+	CONVENTION-fr \
+	HOWTO-Contribute \
+	HOWTO-Robots \
+	HOWTO-ServiceACL-fr \
+	INSTALL \
+	LICENSE \
+	README-fr\
+	VHFFS4-auth1024.png \
+	VHFFS4-auth2048.png
+	
+nobase_doc_DATA = \
+	config/apache/panelconf
\ Pas de fin de ligne à la fin du fichier.
diff -Nru vhffs-542-nosvn/vhffs-irc/modobot.pl vhffs-agh/vhffs-irc/modobot.pl
--- vhffs-542-nosvn/vhffs-irc/modobot.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-irc/modobot.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! %PERL%
 
 # modobot is an IRC bot which allow you to validate
 # VHFFS objects through IRC
@@ -11,7 +11,7 @@
 use Locale::gettext;
 use Data::Dumper;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-jabber/Makefile.am vhffs-agh/vhffs-jabber/Makefile.am
--- vhffs-542-nosvn/vhffs-jabber/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-jabber/Makefile.am	2007-04-06 18:14:25.000000000 +0200
@@ -0,0 +1,14 @@
+jabberdir = @JABBERDIR@
+jabber_SCRIPTS = vhffspipe.pl
+
+# Define the substitution we need to point perl script at correct location
+do_sed = $(SED) --in-place \
+	-e 's,%PERL%,$(PERL),g' \
+	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g'
+
+# Because automake, exec-hook is executed before install-scripts
+# so install-data is after. Here we use a data-hook
+install-data-hook :
+	for f in $(jabber_SCRIPTS) ; do \
+		$(do_sed) $(DESTDIR)$(jabberdir)/$$f; \
+	done
\ Pas de fin de ligne à la fin du fichier.
diff -Nru vhffs-542-nosvn/vhffs-jabber/vhffspipe.pl vhffs-agh/vhffs-jabber/vhffspipe.pl
--- vhffs-542-nosvn/vhffs-jabber/vhffspipe.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-jabber/vhffspipe.pl	2007-04-06 18:47:42.000000000 +0200
@@ -1,7 +1,7 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-listengine/Makefile.am vhffs-agh/vhffs-listengine/Makefile.am
--- vhffs-542-nosvn/vhffs-listengine/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-listengine/Makefile.am	2007-03-28 19:33:14.000000000 +0200
@@ -0,0 +1,3 @@
+SUBDIRS = src
+EXTRA_DIST = misc
+
diff -Nru vhffs-542-nosvn/vhffs-listengine/src/archives/archives.pl vhffs-agh/vhffs-listengine/src/archives/archives.pl
--- vhffs-542-nosvn/vhffs-listengine/src/archives/archives.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-listengine/src/archives/archives.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use HTML::Template;
 use CGI;
 use CGI::Session;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Panel::Main;
 use Vhffs::Functions;
diff -Nru vhffs-542-nosvn/vhffs-listengine/src/archives/Makefile.am vhffs-agh/vhffs-listengine/src/archives/Makefile.am
--- vhffs-542-nosvn/vhffs-listengine/src/archives/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-listengine/src/archives/Makefile.am	2007-03-28 19:33:14.000000000 +0200
@@ -0,0 +1,18 @@
+lewebdir = @LEWEBDIR@
+leweb_DATA = \
+	archives.pl \
+	show_msg.pl \
+	templates/byday_sub.tmpl \
+	templates/byday.tmpl \
+	templates/bymonth_sub.tmpl \
+	templates/bymonth.tmpl \
+	templates/byyear_sub.tmpl \
+	templates/byyear.tmpl \
+	templates/error.tmpl \
+	templates/lang_part.tmpl \
+	templates/langs.tmpl \
+	templates/list_sub.tmpl \
+	templates/list.tmpl \
+	templates/showmsg.tmpl \
+	templates/themes_part.tmpl \
+	templates/themes.tmpl
\ Pas de fin de ligne à la fin du fichier.
diff -Nru vhffs-542-nosvn/vhffs-listengine/src/archives/show_msg.pl vhffs-agh/vhffs-listengine/src/archives/show_msg.pl
--- vhffs-542-nosvn/vhffs-listengine/src/archives/show_msg.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-listengine/src/archives/show_msg.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use HTML::Template;
 use CGI;
 use CGI::Session;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Functions;
 use Vhffs::Services::Mailing;
diff -Nru vhffs-542-nosvn/vhffs-listengine/src/listengine.pl vhffs-agh/vhffs-listengine/src/listengine.pl
--- vhffs-542-nosvn/vhffs-listengine/src/listengine.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-listengine/src/listengine.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -37,7 +37,7 @@
 use locale;
 use Locale::gettext;
 use Mail::Internet;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Services::Mailing;
 use Vhffs::Listengine::Intl;
diff -Nru vhffs-542-nosvn/vhffs-listengine/src/Makefile.am vhffs-agh/vhffs-listengine/src/Makefile.am
--- vhffs-542-nosvn/vhffs-listengine/src/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-listengine/src/Makefile.am	2007-03-28 19:33:14.000000000 +0200
@@ -0,0 +1,16 @@
+SUBDIR = archives
+
+ledir = @LEDIR@
+le_SCRIPTS = listengine.pl
+
+# Define the substitution we need to point perl script at correct location
+do_sed = $(SED) --in-place \
+	-e 's,%PERL%,$(PERL),g' \
+	-e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g'
+
+# Because automake, exec-hook is executed before install-scripts
+# so install-data is after. Here we use a data-hook
+install-data-hook :
+	for f in $(le_SCRIPTS) ; do \
+		$(do_sed) $(DESTDIR)$(ledir)/$$f; \
+	done
\ Pas de fin de ligne à la fin du fichier.
diff -Nru vhffs-542-nosvn/vhffs-panel/acl/add_acl_group.pl vhffs-agh/vhffs-panel/acl/add_acl_group.pl
--- vhffs-542-nosvn/vhffs-panel/acl/add_acl_group.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/acl/add_acl_group.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/acl/add_acl_user.pl vhffs-agh/vhffs-panel/acl/add_acl_user.pl
--- vhffs-542-nosvn/vhffs-panel/acl/add_acl_user.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/acl/add_acl_user.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/acl/submit.pl vhffs-agh/vhffs-panel/acl/submit.pl
--- vhffs-542-nosvn/vhffs-panel/acl/submit.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/acl/submit.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/acl/view.pl vhffs-agh/vhffs-panel/acl/view.pl
--- vhffs-542-nosvn/vhffs-panel/acl/view.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/acl/view.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/broadcast_delete.pl vhffs-agh/vhffs-panel/admin/broadcast_delete.pl
--- vhffs-542-nosvn/vhffs-panel/admin/broadcast_delete.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/broadcast_delete.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/broadcast_list.pl vhffs-agh/vhffs-panel/admin/broadcast_list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/broadcast_list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/broadcast_list.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/broadcast.pl vhffs-agh/vhffs-panel/admin/broadcast.pl
--- vhffs-542-nosvn/vhffs-panel/admin/broadcast.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/broadcast.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/broadcast_submit.pl vhffs-agh/vhffs-panel/admin/broadcast_submit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/broadcast_submit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/broadcast_submit.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/broadcast_view.pl vhffs-agh/vhffs-panel/admin/broadcast_view.pl
--- vhffs-542-nosvn/vhffs-panel/admin/broadcast_view.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/broadcast_view.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/cvs/edit.pl vhffs-agh/vhffs-panel/admin/cvs/edit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/cvs/edit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/cvs/edit.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/cvs/edit_submit.pl vhffs-agh/vhffs-panel/admin/cvs/edit_submit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/cvs/edit_submit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/cvs/edit_submit.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/cvs/list.pl vhffs-agh/vhffs-panel/admin/cvs/list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/cvs/list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/cvs/list.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/cvs/search.pl vhffs-agh/vhffs-panel/admin/cvs/search.pl
--- vhffs-542-nosvn/vhffs-panel/admin/cvs/search.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/cvs/search.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/cvs/show.pl vhffs-agh/vhffs-panel/admin/cvs/show.pl
--- vhffs-542-nosvn/vhffs-panel/admin/cvs/show.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/cvs/show.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/dns/list.pl vhffs-agh/vhffs-panel/admin/dns/list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/dns/list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/dns/list.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/dns/search.pl vhffs-agh/vhffs-panel/admin/dns/search.pl
--- vhffs-542-nosvn/vhffs-panel/admin/dns/search.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/dns/search.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/group/edit.pl vhffs-agh/vhffs-panel/admin/group/edit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/group/edit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/group/edit.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/group/edit_submit.pl vhffs-agh/vhffs-panel/admin/group/edit_submit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/group/edit_submit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/group/edit_submit.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/group/list.pl vhffs-agh/vhffs-panel/admin/group/list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/group/list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/group/list.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/group/search.pl vhffs-agh/vhffs-panel/admin/group/search.pl
--- vhffs-542-nosvn/vhffs-panel/admin/group/search.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/group/search.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/group/show.pl vhffs-agh/vhffs-panel/admin/group/show.pl
--- vhffs-542-nosvn/vhffs-panel/admin/group/show.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/group/show.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mail/change_forward.pl vhffs-agh/vhffs-panel/admin/mail/change_forward.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mail/change_forward.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mail/change_forward.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mail/delete_box.pl vhffs-agh/vhffs-panel/admin/mail/delete_box.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mail/delete_box.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mail/delete_box.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mail/delete_forward.pl vhffs-agh/vhffs-panel/admin/mail/delete_forward.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mail/delete_forward.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mail/delete_forward.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mail/edit.pl vhffs-agh/vhffs-panel/admin/mail/edit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mail/edit.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/admin/mail/edit.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mail/list.pl vhffs-agh/vhffs-panel/admin/mail/list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mail/list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mail/list.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mail/password_box.pl vhffs-agh/vhffs-panel/admin/mail/password_box.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mail/password_box.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mail/password_box.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mail/search.pl vhffs-agh/vhffs-panel/admin/mail/search.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mail/search.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mail/search.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mail/show.pl vhffs-agh/vhffs-panel/admin/mail/show.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mail/show.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/admin/mail/show.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mailing/list.pl vhffs-agh/vhffs-panel/admin/mailing/list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mailing/list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mailing/list.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mailing/mailing_submit.pl vhffs-agh/vhffs-panel/admin/mailing/mailing_submit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mailing/mailing_submit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mailing/mailing_submit.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mailing/search.pl vhffs-agh/vhffs-panel/admin/mailing/search.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mailing/search.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mailing/search.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/moderation.pl vhffs-agh/vhffs-panel/admin/moderation.pl
--- vhffs-542-nosvn/vhffs-panel/admin/moderation.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/admin/moderation.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/moderation_submit.pl vhffs-agh/vhffs-panel/admin/moderation_submit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/moderation_submit.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/admin/moderation_submit.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mysql/edit.pl vhffs-agh/vhffs-panel/admin/mysql/edit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mysql/edit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mysql/edit.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mysql/edit_submit.pl vhffs-agh/vhffs-panel/admin/mysql/edit_submit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mysql/edit_submit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mysql/edit_submit.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mysql/list.pl vhffs-agh/vhffs-panel/admin/mysql/list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mysql/list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mysql/list.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mysql/search.pl vhffs-agh/vhffs-panel/admin/mysql/search.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mysql/search.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mysql/search.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/mysql/show.pl vhffs-agh/vhffs-panel/admin/mysql/show.pl
--- vhffs-542-nosvn/vhffs-panel/admin/mysql/show.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/mysql/show.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/object/delete_avatar.pl vhffs-agh/vhffs-panel/admin/object/delete_avatar.pl
--- vhffs-542-nosvn/vhffs-panel/admin/object/delete_avatar.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/object/delete_avatar.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/object/edit.pl vhffs-agh/vhffs-panel/admin/object/edit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/object/edit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/object/edit.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/object/edit_submit.pl vhffs-agh/vhffs-panel/admin/object/edit_submit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/object/edit_submit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/object/edit_submit.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/object/list.pl vhffs-agh/vhffs-panel/admin/object/list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/object/list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/object/list.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/object/search.pl vhffs-agh/vhffs-panel/admin/object/search.pl
--- vhffs-542-nosvn/vhffs-panel/admin/object/search.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/object/search.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/pgsql/edit.pl vhffs-agh/vhffs-panel/admin/pgsql/edit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/pgsql/edit.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/admin/pgsql/edit.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/pgsql/edit_submit.pl vhffs-agh/vhffs-panel/admin/pgsql/edit_submit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/pgsql/edit_submit.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/admin/pgsql/edit_submit.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/pgsql/list.pl vhffs-agh/vhffs-panel/admin/pgsql/list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/pgsql/list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/pgsql/list.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/pgsql/search.pl vhffs-agh/vhffs-panel/admin/pgsql/search.pl
--- vhffs-542-nosvn/vhffs-panel/admin/pgsql/search.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/pgsql/search.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/pgsql/show.pl vhffs-agh/vhffs-panel/admin/pgsql/show.pl
--- vhffs-542-nosvn/vhffs-panel/admin/pgsql/show.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/admin/pgsql/show.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/repository/edit.pl vhffs-agh/vhffs-panel/admin/repository/edit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/repository/edit.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/admin/repository/edit.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/repository/edit_submit.pl vhffs-agh/vhffs-panel/admin/repository/edit_submit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/repository/edit_submit.pl	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-panel/admin/repository/edit_submit.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/repository/list.pl vhffs-agh/vhffs-panel/admin/repository/list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/repository/list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/repository/list.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/repository/search.pl vhffs-agh/vhffs-panel/admin/repository/search.pl
--- vhffs-542-nosvn/vhffs-panel/admin/repository/search.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/repository/search.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/repository/show.pl vhffs-agh/vhffs-panel/admin/repository/show.pl
--- vhffs-542-nosvn/vhffs-panel/admin/repository/show.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/admin/repository/show.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/stats.pl vhffs-agh/vhffs-panel/admin/stats.pl
--- vhffs-542-nosvn/vhffs-panel/admin/stats.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/stats.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/su.pl vhffs-agh/vhffs-panel/admin/su.pl
--- vhffs-542-nosvn/vhffs-panel/admin/su.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/su.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/svn/list.pl vhffs-agh/vhffs-panel/admin/svn/list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/svn/list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/svn/list.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -34,7 +34,7 @@
 use HTML::Template;
 use Locale::gettext;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Panel::Main;
 use Vhffs::Panel::Svn;
 
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/svn/search.pl vhffs-agh/vhffs-panel/admin/svn/search.pl
--- vhffs-542-nosvn/vhffs-panel/admin/svn/search.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/svn/search.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/user/edit_note.pl vhffs-agh/vhffs-panel/admin/user/edit_note.pl
--- vhffs-542-nosvn/vhffs-panel/admin/user/edit_note.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/user/edit_note.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/user/edit.pl vhffs-agh/vhffs-panel/admin/user/edit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/user/edit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/user/edit.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/user/edit_submit.pl vhffs-agh/vhffs-panel/admin/user/edit_submit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/user/edit_submit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/user/edit_submit.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/user/list.pl vhffs-agh/vhffs-panel/admin/user/list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/user/list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/user/list.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -34,7 +34,7 @@
 use HTML::Template;
 use Locale::gettext;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Panel::Main;
 use Vhffs::Panel::Menu;
 use Vhffs::Panel::User;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/user/search.pl vhffs-agh/vhffs-panel/admin/user/search.pl
--- vhffs-542-nosvn/vhffs-panel/admin/user/search.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/user/search.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/user/show.pl vhffs-agh/vhffs-panel/admin/user/show.pl
--- vhffs-542-nosvn/vhffs-panel/admin/user/show.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/user/show.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/web/edit.pl vhffs-agh/vhffs-panel/admin/web/edit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/web/edit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/web/edit.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/web/edit_submit.pl vhffs-agh/vhffs-panel/admin/web/edit_submit.pl
--- vhffs-542-nosvn/vhffs-panel/admin/web/edit_submit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/web/edit_submit.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/web/list.pl vhffs-agh/vhffs-panel/admin/web/list.pl
--- vhffs-542-nosvn/vhffs-panel/admin/web/list.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/web/list.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -34,7 +34,7 @@
 use Locale::gettext;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Panel::Main;
 use Vhffs::Panel::Web;
 
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/web/search.pl vhffs-agh/vhffs-panel/admin/web/search.pl
--- vhffs-542-nosvn/vhffs-panel/admin/web/search.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/web/search.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/admin/web/show.pl vhffs-agh/vhffs-panel/admin/web/show.pl
--- vhffs-542-nosvn/vhffs-panel/admin/web/show.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/admin/web/show.pl	2007-03-28 19:33:13.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/alert.pl vhffs-agh/vhffs-panel/alert.pl
--- vhffs-542-nosvn/vhffs-panel/alert.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/alert.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/alert_submit.pl vhffs-agh/vhffs-panel/alert_submit.pl
--- vhffs-542-nosvn/vhffs-panel/alert_submit.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/alert_submit.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/auth.pl vhffs-agh/vhffs-panel/auth.pl
--- vhffs-542-nosvn/vhffs-panel/auth.pl	2007-04-03 21:24:44.000000000 +0200
+++ vhffs-agh/vhffs-panel/auth.pl	2007-04-03 21:31:06.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -37,7 +37,7 @@
 use Locale::gettext;
 use HTML::Template;
 use CGI;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Panel::Main;
 use Vhffs::Panel::Commons;
diff -Nru vhffs-542-nosvn/vhffs-panel/cvs/create.pl vhffs-agh/vhffs-panel/cvs/create.pl
--- vhffs-542-nosvn/vhffs-panel/cvs/create.pl	2007-04-05 21:27:25.000000000 +0200
+++ vhffs-agh/vhffs-panel/cvs/create.pl	2007-04-06 18:14:25.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/cvs/delete.pl vhffs-agh/vhffs-panel/cvs/delete.pl
--- vhffs-542-nosvn/vhffs-panel/cvs/delete.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/cvs/delete.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/cvs/prefs.pl vhffs-agh/vhffs-panel/cvs/prefs.pl
--- vhffs-542-nosvn/vhffs-panel/cvs/prefs.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/cvs/prefs.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/cvs/prefs_save.pl vhffs-agh/vhffs-panel/cvs/prefs_save.pl
--- vhffs-542-nosvn/vhffs-panel/cvs/prefs_save.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/cvs/prefs_save.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/add_a.pl vhffs-agh/vhffs-panel/dns/add_a.pl
--- vhffs-542-nosvn/vhffs-panel/dns/add_a.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/add_a.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -43,7 +43,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/add_cname.pl vhffs-agh/vhffs-panel/dns/add_cname.pl
--- vhffs-542-nosvn/vhffs-panel/dns/add_cname.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/add_cname.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/add_mx.pl vhffs-agh/vhffs-panel/dns/add_mx.pl
--- vhffs-542-nosvn/vhffs-panel/dns/add_mx.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/add_mx.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/add_ns.pl vhffs-agh/vhffs-panel/dns/add_ns.pl
--- vhffs-542-nosvn/vhffs-panel/dns/add_ns.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/add_ns.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/create.pl vhffs-agh/vhffs-panel/dns/create.pl
--- vhffs-542-nosvn/vhffs-panel/dns/create.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-panel/dns/create.pl	2007-03-28 19:33:09.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w -I/vhffs/vhffs-api/src/ -I/vhffs/vhffs-panel/
+#!%PERL% -w -I/vhffs/vhffs-api/src/ -I/vhffs/vhffs-panel/
 
 use POSIX qw(locale_h);
 use HTML::Template;
@@ -9,7 +9,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/delete_a.pl vhffs-agh/vhffs-panel/dns/delete_a.pl
--- vhffs-542-nosvn/vhffs-panel/dns/delete_a.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/delete_a.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 
 use POSIX qw(locale_h);
 use HTML::Template;
@@ -9,7 +9,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/delete_cname.pl vhffs-agh/vhffs-panel/dns/delete_cname.pl
--- vhffs-542-nosvn/vhffs-panel/dns/delete_cname.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/delete_cname.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/delete_mx.pl vhffs-agh/vhffs-panel/dns/delete_mx.pl
--- vhffs-542-nosvn/vhffs-panel/dns/delete_mx.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/delete_mx.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/delete_ns.pl vhffs-agh/vhffs-panel/dns/delete_ns.pl
--- vhffs-542-nosvn/vhffs-panel/dns/delete_ns.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/delete_ns.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/delete.pl vhffs-agh/vhffs-panel/dns/delete.pl
--- vhffs-542-nosvn/vhffs-panel/dns/delete.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/delete.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/dns_submit.pl vhffs-agh/vhffs-panel/dns/dns_submit.pl
--- vhffs-542-nosvn/vhffs-panel/dns/dns_submit.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/dns_submit.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/dns_type_submit.pl vhffs-agh/vhffs-panel/dns/dns_type_submit.pl
--- vhffs-542-nosvn/vhffs-panel/dns/dns_type_submit.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/dns_type_submit.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/modif_a.pl vhffs-agh/vhffs-panel/dns/modif_a.pl
--- vhffs-542-nosvn/vhffs-panel/dns/modif_a.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/modif_a.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/modif_cname.pl vhffs-agh/vhffs-panel/dns/modif_cname.pl
--- vhffs-542-nosvn/vhffs-panel/dns/modif_cname.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/modif_cname.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/modif_mx.pl vhffs-agh/vhffs-panel/dns/modif_mx.pl
--- vhffs-542-nosvn/vhffs-panel/dns/modif_mx.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/modif_mx.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/dns/prefs.pl vhffs-agh/vhffs-panel/dns/prefs.pl
--- vhffs-542-nosvn/vhffs-panel/dns/prefs.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/dns/prefs.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/getavatar.pl vhffs-agh/vhffs-panel/getavatar.pl
--- vhffs-542-nosvn/vhffs-panel/getavatar.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/getavatar.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -33,7 +33,7 @@
 use CGI;
 use GD;
 use GD::Text::Wrap;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Object;
 use Vhffs::Panel::Avatar;
diff -Nru vhffs-542-nosvn/vhffs-panel/group/create.pl vhffs-agh/vhffs-panel/group/create.pl
--- vhffs-542-nosvn/vhffs-panel/group/create.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/group/create.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/group/delete.pl vhffs-agh/vhffs-panel/group/delete.pl
--- vhffs-542-nosvn/vhffs-panel/group/delete.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/group/delete.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/group/join_group.pl vhffs-agh/vhffs-panel/group/join_group.pl
--- vhffs-542-nosvn/vhffs-panel/group/join_group.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/group/join_group.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/group/prefs.pl vhffs-agh/vhffs-panel/group/prefs.pl
--- vhffs-542-nosvn/vhffs-panel/group/prefs.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/group/prefs.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/group/prefs_save.pl vhffs-agh/vhffs-panel/group/prefs_save.pl
--- vhffs-542-nosvn/vhffs-panel/group/prefs_save.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/group/prefs_save.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/group/project_submit.pl vhffs-agh/vhffs-panel/group/project_submit.pl
--- vhffs-542-nosvn/vhffs-panel/group/project_submit.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/group/project_submit.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/group/quota_used.pl vhffs-agh/vhffs-panel/group/quota_used.pl
--- vhffs-542-nosvn/vhffs-panel/group/quota_used.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/group/quota_used.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -42,7 +42,7 @@
 use GD::Text::Wrap;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/group/remove_user_from_group.pl vhffs-agh/vhffs-panel/group/remove_user_from_group.pl
--- vhffs-542-nosvn/vhffs-panel/group/remove_user_from_group.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/group/remove_user_from_group.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/history.pl vhffs-agh/vhffs-panel/history.pl
--- vhffs-542-nosvn/vhffs-panel/history.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/history.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/logout.pl vhffs-agh/vhffs-panel/logout.pl
--- vhffs-542-nosvn/vhffs-panel/logout.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/logout.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -37,7 +37,7 @@
 use CGI;
 use CGI::Session;
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Panel::Main;
 
 my $panel = new_light Vhffs::Panel::Main();
diff -Nru vhffs-542-nosvn/vhffs-panel/lost_ack.pl vhffs-agh/vhffs-panel/lost_ack.pl
--- vhffs-542-nosvn/vhffs-panel/lost_ack.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/lost_ack.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/lost.pl vhffs-agh/vhffs-panel/lost.pl
--- vhffs-542-nosvn/vhffs-panel/lost.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/lost.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -37,7 +37,7 @@
 use Locale::gettext;
 use HTML::Template;
 use CGI;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Panel::Main;
 
 
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/add_account.pl vhffs-agh/vhffs-panel/mail/add_account.pl
--- vhffs-542-nosvn/vhffs-panel/mail/add_account.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/mail/add_account.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/add_forward.pl vhffs-agh/vhffs-panel/mail/add_forward.pl
--- vhffs-542-nosvn/vhffs-panel/mail/add_forward.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/mail/add_forward.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/change_forward.pl vhffs-agh/vhffs-panel/mail/change_forward.pl
--- vhffs-542-nosvn/vhffs-panel/mail/change_forward.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/mail/change_forward.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/create.pl vhffs-agh/vhffs-panel/mail/create.pl
--- vhffs-542-nosvn/vhffs-panel/mail/create.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/mail/create.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/delete_box.pl vhffs-agh/vhffs-panel/mail/delete_box.pl
--- vhffs-542-nosvn/vhffs-panel/mail/delete_box.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/mail/delete_box.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/delete_forward.pl vhffs-agh/vhffs-panel/mail/delete_forward.pl
--- vhffs-542-nosvn/vhffs-panel/mail/delete_forward.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/mail/delete_forward.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/delete.pl vhffs-agh/vhffs-panel/mail/delete.pl
--- vhffs-542-nosvn/vhffs-panel/mail/delete.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/mail/delete.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/password_box.pl vhffs-agh/vhffs-panel/mail/password_box.pl
--- vhffs-542-nosvn/vhffs-panel/mail/password_box.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/mail/password_box.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/prefs.pl vhffs-agh/vhffs-panel/mail/prefs.pl
--- vhffs-542-nosvn/vhffs-panel/mail/prefs.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/mail/prefs.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/save_catchall.pl vhffs-agh/vhffs-panel/mail/save_catchall.pl
--- vhffs-542-nosvn/vhffs-panel/mail/save_catchall.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/mail/save_catchall.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/spambox.pl vhffs-agh/vhffs-panel/mail/spambox.pl
--- vhffs-542-nosvn/vhffs-panel/mail/spambox.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/mail/spambox.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/spamvirus.pl vhffs-agh/vhffs-panel/mail/spamvirus.pl
--- vhffs-542-nosvn/vhffs-panel/mail/spamvirus.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/mail/spamvirus.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mail/submit.pl vhffs-agh/vhffs-panel/mail/submit.pl
--- vhffs-542-nosvn/vhffs-panel/mail/submit.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/mail/submit.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mailinglist/add_sub.pl vhffs-agh/vhffs-panel/mailinglist/add_sub.pl
--- vhffs-542-nosvn/vhffs-panel/mailinglist/add_sub.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/mailinglist/add_sub.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mailinglist/change_right.pl vhffs-agh/vhffs-panel/mailinglist/change_right.pl
--- vhffs-542-nosvn/vhffs-panel/mailinglist/change_right.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/mailinglist/change_right.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mailinglist/create.pl vhffs-agh/vhffs-panel/mailinglist/create.pl
--- vhffs-542-nosvn/vhffs-panel/mailinglist/create.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/mailinglist/create.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mailinglist/delete.pl vhffs-agh/vhffs-panel/mailinglist/delete.pl
--- vhffs-542-nosvn/vhffs-panel/mailinglist/delete.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/mailinglist/delete.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mailinglist/del_member.pl vhffs-agh/vhffs-panel/mailinglist/del_member.pl
--- vhffs-542-nosvn/vhffs-panel/mailinglist/del_member.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/mailinglist/del_member.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mailinglist/prefs.pl vhffs-agh/vhffs-panel/mailinglist/prefs.pl
--- vhffs-542-nosvn/vhffs-panel/mailinglist/prefs.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/mailinglist/prefs.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mailinglist/save_options.pl vhffs-agh/vhffs-panel/mailinglist/save_options.pl
--- vhffs-542-nosvn/vhffs-panel/mailinglist/save_options.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/mailinglist/save_options.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mailinglist/save_sig.pl vhffs-agh/vhffs-panel/mailinglist/save_sig.pl
--- vhffs-542-nosvn/vhffs-panel/mailinglist/save_sig.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/mailinglist/save_sig.pl	2007-04-06 18:46:27.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mailinglist/submit.pl vhffs-agh/vhffs-panel/mailinglist/submit.pl
--- vhffs-542-nosvn/vhffs-panel/mailinglist/submit.pl	2007-04-05 21:27:25.000000000 +0200
+++ vhffs-agh/vhffs-panel/mailinglist/submit.pl	2007-04-06 18:14:25.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/Makefile.am vhffs-agh/vhffs-panel/Makefile.am
--- vhffs-542-nosvn/vhffs-panel/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-panel/Makefile.am	2007-04-06 18:32:52.000000000 +0200
@@ -0,0 +1,495 @@
+paneldir = @PANELDIR@
+nobase_panel_SCRIPTS = alert_submit.pl \
+	alert.pl \
+	auth.pl \
+	auth.pl \
+	favicon.ico \
+	getavatar.pl \
+	history.pl \
+	logout.pl \
+	lost_ack.pl \
+	panel.pl \
+	show_code.pl \
+	subscribe.pl \
+	acl/add_acl_group.pl \
+	acl/add_acl_user.pl \
+	acl/submit.pl \
+	acl/view.pl \
+	admin/cvs/edit_submit.pl \
+	admin/cvs/edit.pl \
+	admin/cvs/list.pl \
+	admin/cvs/search.pl \
+	admin/cvs/show.pl \
+	admin/dns/list.pl \
+	admin/dns/search.pl \
+	admin/group/edit_submit.pl \
+	admin/group/edit.pl \
+	admin/group/list.pl \
+	admin/group/search.pl \
+	admin/group/show.pl \
+	admin/mail/change_forward.pl \
+	admin/mail/delete_box.pl \
+	admin/mail/delete_forward.pl \
+	admin/mail/edit.pl \
+	admin/mail/list.pl \
+	admin/mail/password_box.pl \
+	admin/mail/search.pl \
+	admin/mail/show.pl \
+	admin/mailing/list.pl \
+	admin/mailing/mailing_submit.pl \
+	admin/mailing/search.pl \
+	admin/mysql/edit_submit.pl \
+	admin/mysql/edit.pl \
+	admin/mysql/list.pl \
+	admin/mysql/search.pl \
+	admin/mysql/show.pl \
+	admin/object/delete_avatar.pl \
+	admin/object/edit_submit.pl \
+	admin/object/edit.pl \
+	admin/object/list.pl \
+	admin/object/search.pl \
+	admin/pgsql/edit_submit.pl \
+	admin/pgsql/edit.pl \
+	admin/pgsql/list.pl \
+	admin/pgsql/search.pl \
+	admin/pgsql/show.pl \
+	admin/repository/edit_submit.pl \
+	admin/repository/edit.pl \
+	admin/repository/list.pl \
+	admin/repository/search.pl \
+	admin/repository/show.pl \
+	admin/svn/list.pl \
+	admin/svn/search.pl \
+	admin/user/edit_note.pl \
+	admin/user/edit_submit.pl \
+	admin/user/edit.pl \
+	admin/user/list.pl \
+	admin/user/search.pl \
+	admin/user/show.pl \
+	admin/web/edit_submit.pl \
+	admin/web/edit.pl \
+	admin/web/list.pl \
+	admin/web/search.pl \
+	admin/web/show.pl \
+	admin/broadcast_delete.pl \
+	admin/broadcast_list.pl \
+	admin/broadcast_submit.pl \
+	admin/broadcast_view.pl \
+	admin/broadcast.pl \
+	admin/moderation_submit.pl \
+	admin/moderation.pl \
+	admin/stats.pl \
+	admin/su.pl \
+	cvs/create.pl \
+	cvs/delete.pl \
+	cvs/prefs_save.pl \
+	cvs/prefs.pl \
+	dns/add_a.pl \
+	dns/add_cname.pl \
+	dns/add_mx.pl \
+	dns/add_ns.pl \
+	dns/create.pl \
+	dns/delete_a.pl \
+	dns/delete_cname.pl \
+	dns/delete_mx.pl \
+	dns/delete_ns.pl \
+	dns/delete.pl \
+	dns/dns_submit.pl \
+	dns/dns_type_submit.pl \
+	dns/modif_a.pl \
+	dns/modif_cname.pl \
+	dns/modif_mx.pl \
+	dns/prefs.pl \
+	group/create.pl \
+	group/delete.pl \
+	group/join_group.pl \
+	group/prefs_save.pl \
+	group/prefs.pl \
+	group/project_submit.pl \
+	group/quota_used.pl \
+	group/remove_user_from_group.pl \
+	help/cvs.html \
+	help/index.html \
+	mail/add_account.pl \
+	mail/add_forward.pl \
+	mail/change_forward.pl \
+	mail/create.pl \
+	mail/delete_box.pl \
+	mail/delete_forward.pl \
+	mail/delete.pl \
+	mail/password_box.pl \
+	mail/prefs.pl \
+	mail/save_catchall.pl \
+	mail/spambox.pl \
+	mail/spamvirus.pl \
+	mail/submit.pl \
+	mailinglist/add_sub.pl \
+	mailinglist/change_right.pl \
+	mailinglist/create.pl \
+	mailinglist/del_member.pl \
+	mailinglist/delete.pl \
+	mailinglist/prefs.pl \
+	mailinglist/save_options.pl \
+	mailinglist/save_sig.pl \
+	mailinglist/submit.pl \
+	mysql/create.pl \
+	mysql/delete.pl \
+	mysql/prefs_save.pl \
+	mysql/prefs.pl \
+	mysql/submit.pl \
+	object/upavatar.pl \
+	pgsql/create.pl \
+	pgsql/delete.pl \
+	pgsql/pgsql_submit.pl \
+	pgsql/prefs_save.pl \
+	pgsql/prefs.pl \
+	public/allgroups.pl \
+	public/allwebsites.pl \
+	public/group.pl \
+	public/index.pl \
+	public/lastgroups.pl \
+	public/lastusers.pl \
+	public/user.pl \
+	public/websearch.pl \
+	public/rss/lastgroups.pl \
+	public/rss/lastusers.pl \
+	repository/create.pl \
+	repository/delete.pl \
+	repository/prefs_save.pl \
+	repository/prefs.pl \
+	repository/quota_used.pl \
+	repository/repository_submit.pl \
+	svn/create.pl \
+	svn/delete.pl \
+	svn/prefs_save.pl \
+	svn/prefs.pl \
+	svn/svn_submit.pl \
+	user/delete.pl \
+	user/prefs.pl \
+	web/create.pl \
+	web/delete.pl \
+	web/prefs_save.pl \
+	web/prefs.pl \
+	web/web_submit.pl
+
+paneltemplatesdir = @TEMPLATESDIR@
+nobase_paneltemplates_DATA = \
+	templates/acl/view_each.tmpl \
+	templates/acl/view.tmpl \
+	templates/admin/cvs/edit.tmpl \
+	templates/admin/cvs/menu.tmpl \
+	templates/admin/cvs/part-modo.tmpl \
+	templates/admin/cvs/part.tmpl \
+	templates/admin/cvs/search.tmpl \
+	templates/admin/cvs/show.tmpl \
+	templates/admin/dns/menu.tmpl \
+	templates/admin/dns/part-modo.tmpl \
+	templates/admin/dns/part.tmpl \
+	templates/admin/dns/search.tmpl \
+	templates/admin/group/edit.tmpl \
+	templates/admin/group/menu.tmpl \
+	templates/admin/group/part-modo.tmpl \
+	templates/admin/group/part.tmpl \
+	templates/admin/group/search.tmpl \
+	templates/admin/group/show.tmpl \
+	templates/admin/mail/admin_box-modo.tmpl \
+	templates/admin/mail/admin_box.tmpl \
+	templates/admin/mail/admin_forward-modo.tmpl \
+	templates/admin/mail/admin_forward.tmpl \
+	templates/admin/mail/edit.tmpl \
+	templates/admin/mailing/menu.tmpl \
+	templates/admin/mailing/part.tmpl \
+	templates/admin/mailing/search.tmpl \
+	templates/admin/mail/menu.tmpl \
+	templates/admin/mail/part-modo.tmpl \
+	templates/admin/mail/part.tmpl \
+	templates/admin/mail/search.tmpl \
+	templates/admin/mail/show.tmpl \
+	templates/admin/main/general-modo.tmpl \
+	templates/admin/main/general.tmpl \
+	templates/admin/main/main.tmpl \
+	templates/admin/misc/broadcast_list.tmpl \
+	templates/admin/misc/broadcast_part.tmpl \
+	templates/admin/misc/broadcast.tmpl \
+	templates/admin/misc/broadcast_view.tmpl \
+	templates/admin/misc/list.tmpl \
+	templates/admin/misc/mailings_part.tmpl \
+	templates/admin/misc/moderation_applied.tmpl \
+	templates/admin/misc/moderation_part.tmpl \
+	templates/admin/misc/moderation.tmpl \
+	templates/admin/misc/opart.tmpl \
+	templates/admin/misc/stats.tmpl \
+	templates/admin/misc/su.tmpl \
+	templates/admin/mysql/edit.tmpl \
+	templates/admin/mysql/menu.tmpl \
+	templates/admin/mysql/part-modo.tmpl \
+	templates/admin/mysql/part.tmpl \
+	templates/admin/mysql/search.tmpl \
+	templates/admin/mysql/show.tmpl \
+	templates/admin/object/edit.tmpl \
+	templates/admin/object/part.tmpl \
+	templates/admin/object/search.tmpl \
+	templates/admin/pgsql/edit.tmpl \
+	templates/admin/pgsql/menu.tmpl \
+	templates/admin/pgsql/part-modo.tmpl \
+	templates/admin/pgsql/part.tmpl \
+	templates/admin/pgsql/search.tmpl \
+	templates/admin/pgsql/show.tmpl \
+	templates/admin/repository/edit.tmpl \
+	templates/admin/repository/menu.tmpl \
+	templates/admin/repository/part-modo.tmpl \
+	templates/admin/repository/part.tmpl \
+	templates/admin/repository/search.tmpl \
+	templates/admin/repository/show.tmpl \
+	templates/admin/svn/menu.tmpl \
+	templates/admin/svn/part-modo.tmpl \
+	templates/admin/svn/part.tmpl \
+	templates/admin/svn/search.tmpl \
+	templates/admin/user/edit-note.tmpl \
+	templates/admin/user/edit.tmpl \
+	templates/admin/user/group-part.tmpl \
+	templates/admin/user/menu.tmpl \
+	templates/admin/user/part-modo.tmpl \
+	templates/admin/user/part.tmpl \
+	templates/admin/user/search.tmpl \
+	templates/admin/user/show.tmpl \
+	templates/admin/web/edit.tmpl \
+	templates/admin/web/menu.tmpl \
+	templates/admin/web/part-modo.tmpl \
+	templates/admin/web/part.tmpl \
+	templates/admin/web/search.tmpl \
+	templates/admin/web/show.tmpl \
+	templates/cvs/create.tmpl \
+	templates/cvs/menu_sub.tmpl \
+	templates/cvs/menu_sub_wait.tmpl \
+	templates/cvs/menu.tmpl \
+	templates/cvs/prefs.tmpl \
+	templates/dns/create.tmpl \
+	templates/dns/end.tmpl \
+	templates/dns/list_a_sub.tmpl \
+	templates/dns/list_cname_sub.tmpl \
+	templates/dns/list_mx_sub.tmpl \
+	templates/dns/list_ns_sub.tmpl \
+	templates/dns/list_sub.tmpl \
+	templates/dns/menu_sub.tmpl \
+	templates/dns/menu_sub_wait.tmpl \
+	templates/dns/menu.tmpl \
+	templates/dns/prefs.tmpl \
+	templates/dns/type_a.tmpl \
+	templates/dns/type_cname.tmpl \
+	templates/dns/type_mx.tmpl \
+	templates/group/add_user.tmpl \
+	templates/group/create.tmpl \
+	templates/group/each_user.tmpl \
+	templates/group/info.tmpl \
+	templates/group/list_user.tmpl \
+	templates/group/menu_sub.tmpl \
+	templates/group/menu_sub_wait.tmpl \
+	templates/group/menu.tmpl \
+	templates/group/prefs.tmpl \
+	templates/mail/create.tmpl \
+	templates/mailinglist/create.tmpl \
+	templates/mailinglist/list_part.tmpl \
+	templates/mailinglist/menu_sub.tmpl \
+	templates/mailinglist/menu_sub_wait.tmpl \
+	templates/mailinglist/menu.tmpl \
+	templates/mailinglist/prefs.tmpl \
+	templates/mail/menu_sub.tmpl \
+	templates/mail/menu_sub_wait.tmpl \
+	templates/mail/menu.tmpl \
+	templates/mail/prefs_box.tmpl \
+	templates/mail/prefs_forward.tmpl \
+	templates/mail/prefs_spam.tmpl \
+	templates/mail/prefs.tmpl \
+	templates/mail/prefs_virus.tmpl \
+	templates/main/auth.html \
+	templates/main/auth.tmpl \
+	templates/main/close.tmpl \
+	templates/main/login_failed.tmpl \
+	templates/main/login_ok.tmpl \
+	templates/main/logout.tmpl \
+	templates/main/lost_failed.tmpl \
+	templates/main/lost_ok.tmpl \
+	templates/main/lost.tmpl \
+	templates/main/panel.tmpl \
+	templates/menu/group.tmpl \
+	templates/menu/main.tmpl \
+	templates/menu/user.tmpl \
+	templates/misc/alert.tmpl \
+	templates/misc/group_service.tmpl \
+	templates/misc/history_part.tmpl \
+	templates/misc/history.tmpl \
+	templates/misc/simplemsg.tmpl \
+	templates/misc/welcome.tmpl \
+	templates/mysql/create.tmpl \
+	templates/mysql/menu_sub.tmpl \
+	templates/mysql/menu_sub_wait.tmpl \
+	templates/mysql/menu.tmpl \
+	templates/mysql/prefs.tmpl \
+	templates/pgsql/create.tmpl \
+	templates/pgsql/menu_sub.tmpl \
+	templates/pgsql/menu_sub_wait.tmpl \
+	templates/pgsql/menu.tmpl \
+	templates/pgsql/prefs.tmpl \
+	templates/public/allwebsites.tmpl \
+	templates/public/banner.tmpl \
+	templates/public/group_part.tmpl \
+	templates/public/group.tmpl \
+	templates/public/index.tmpl \
+	templates/public/largefile.tmpl \
+	templates/public/lastgroups.tmpl \
+	templates/public/lastusers.tmpl \
+	templates/public/misc/cvs-part.tmpl \
+	templates/public/misc/largefile-dl.tmpl \
+	templates/public/misc/lastgroups-part.tmpl \
+	templates/public/misc/lastusers-part.tmpl \
+	templates/public/misc/list-part.tmpl \
+	templates/public/misc/svn-part.tmpl \
+	templates/public/misc/web-part.tmpl \
+	templates/public/simplemsg.tmpl \
+	templates/public/user_part.tmpl \
+	templates/public/user.tmpl \
+	templates/repository/create.tmpl \
+	templates/repository/menu_sub.tmpl \
+	templates/repository/menu_sub_wait.tmpl \
+	templates/repository/menu.tmpl \
+	templates/repository/prefs.tmpl \
+	templates/svn/create.tmpl \
+	templates/svn/menu_sub.tmpl \
+	templates/svn/menu_sub_wait.tmpl \
+	templates/svn/menu.tmpl \
+	templates/svn/prefs.tmpl \
+	templates/svn/user_part.tmpl \
+	templates/user/create_complete.tmpl \
+	templates/user/create.tmpl \
+	templates/user/mailuserspam.tmpl \
+	templates/user/mailuser.tmpl \
+	templates/user/mailuservirus.tmpl \
+	templates/user/prefs_avatar.tmpl \
+	templates/user/prefs.tmpl \
+	templates/web/create.tmpl \
+	templates/web/mailuser.tmpl \
+	templates/web/menu_sub.tmpl \
+	templates/web/menu_sub_wait.tmpl \
+	templates/web/menu.tmpl \
+	templates/web/prefs.tmpl
+
+
+
+panelthemesdir = @PANELDIR@
+nobase_panelthemes_DATA = \
+	themes/vhffs/images/bug.png \
+	themes/vhffs/images/cvscreate.png \
+	themes/vhffs/images/cvsentry.png \
+	themes/vhffs/images/cvshelp.png \
+	themes/vhffs/images/cvs.png \
+	themes/vhffs/images/dbacces.png \
+	themes/vhffs/images/dbcreate.png \
+	themes/vhffs/images/dbentry.png \
+	themes/vhffs/images/db.png \
+	themes/vhffs/images/dnscreate.png \
+	themes/vhffs/images/dnsentry.png \
+	themes/vhffs/images/dns.png \
+	themes/vhffs/images/en_US.png \
+	themes/vhffs/images/es_ES.png \
+	themes/vhffs/images/fr_FR.png \
+	themes/vhffs/images/help.png \
+	themes/vhffs/images/homeentry.png \
+	themes/vhffs/images/home.png \
+	themes/vhffs/images/it_IT.png \
+	themes/vhffs/images/largefilecreate.png \
+	themes/vhffs/images/largefileentry.png \
+	themes/vhffs/images/largefile.png \
+	themes/vhffs/images/logo_2.png \
+	themes/vhffs/images/logo_old.png \
+	themes/vhffs/images/logo.png \
+	themes/vhffs/images/logout.png \
+	themes/vhffs/images/mailcreate.png \
+	themes/vhffs/images/mailentry.png \
+	themes/vhffs/images/mailingcreate.png \
+	themes/vhffs/images/mailingentry.png \
+	themes/vhffs/images/mailing.png \
+	themes/vhffs/images/mail.png \
+	themes/vhffs/images/projectcontribentry.png \
+	themes/vhffs/images/projectcontrib.png \
+	themes/vhffs/images/projectcreate.png \
+	themes/vhffs/images/projectownerentry.png \
+	themes/vhffs/images/projectowner.png \
+	themes/vhffs/images/projectparams.png \
+	themes/vhffs/images/quota.png \
+	themes/vhffs/images/repositorycreate.png \
+	themes/vhffs/images/repositoryentry.png \
+	themes/vhffs/images/repository.png \
+	themes/vhffs/images/userentry.png \
+	themes/vhffs/images/user.png \
+	themes/vhffs/images/webcreate.png \
+	themes/vhffs/images/webentry.png \
+	themes/vhffs/images/web.png \
+	themes/vhffs/js/menu.js \
+	themes/vhffs/main.css \
+	themes/vhffs-ng/images/bug.png \
+	themes/vhffs-ng/images/buttonbg.png \
+	themes/vhffs-ng/images/cvscreate.png \
+	themes/vhffs-ng/images/cvsentry.png \
+	themes/vhffs-ng/images/cvshelp.png \
+	themes/vhffs-ng/images/cvs.png \
+	themes/vhffs-ng/images/dbacces.png \
+	themes/vhffs-ng/images/dbcreate.png \
+	themes/vhffs-ng/images/dbentry.png \
+	themes/vhffs-ng/images/db.png \
+	themes/vhffs-ng/images/dnscreate.png \
+	themes/vhffs-ng/images/dnsentry.png \
+	themes/vhffs-ng/images/dns.png \
+	themes/vhffs-ng/images/en_US.png \
+	themes/vhffs-ng/images/es_ES.png \
+	themes/vhffs-ng/images/fr_FR.png \
+	themes/vhffs-ng/images/help.png \
+	themes/vhffs-ng/images/homeentry.png \
+	themes/vhffs-ng/images/home.png \
+	themes/vhffs-ng/images/inputbg.png \
+	themes/vhffs-ng/images/it_IT.png \
+	themes/vhffs-ng/images/largefilecreate.png \
+	themes/vhffs-ng/images/largefileentry.png \
+	themes/vhffs-ng/images/largefile.png \
+	themes/vhffs-ng/images/logo_2.png \
+	themes/vhffs-ng/images/logo_old.png \
+	themes/vhffs-ng/images/logo.png \
+	themes/vhffs-ng/images/logout.png \
+	themes/vhffs-ng/images/mailcreate.png \
+	themes/vhffs-ng/images/mailentry.png \
+	themes/vhffs-ng/images/mailingcreate.png \
+	themes/vhffs-ng/images/mailingentry.png \
+	themes/vhffs-ng/images/mailing.png \
+	themes/vhffs-ng/images/mail.png \
+	themes/vhffs-ng/images/projectcontribentry.png \
+	themes/vhffs-ng/images/projectcontrib.png \
+	themes/vhffs-ng/images/projectcreate.png \
+	themes/vhffs-ng/images/projectownerentry.png \
+	themes/vhffs-ng/images/projectowner.png \
+	themes/vhffs-ng/images/projectparams.png \
+	themes/vhffs-ng/images/quota.png \
+	themes/vhffs-ng/images/repositorycreate.png \
+	themes/vhffs-ng/images/repositoryentry.png \
+	themes/vhffs-ng/images/repository.png \
+	themes/vhffs-ng/images/userentry.png \
+	themes/vhffs-ng/images/user.png \
+	themes/vhffs-ng/images/webcreate.png \
+	themes/vhffs-ng/images/webentry.png \
+	themes/vhffs-ng/images/web.png \
+	themes/vhffs-ng/js/browserdetect.js \
+	themes/vhffs-ng/js/menu.js \
+	themes/vhffs-ng/main.css
+
+# Define the substitution we need to point perl script at correct location
+do_sed = $(SED) --in-place \
+	-e 's,%PERL%,$(PERL),g' \
+	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g'
+
+# Because automake, exec-hook is executed before install-scripts
+# so install-data is after. Here we use a data-hook
+install-data-hook :
+	for f in $(nobase_panel_SCRIPTS) ; do \
+		$(do_sed) $(DESTDIR)$(paneldir)/$$f; \
+	done
+
+
diff -Nru vhffs-542-nosvn/vhffs-panel/mysql/create.pl vhffs-agh/vhffs-panel/mysql/create.pl
--- vhffs-542-nosvn/vhffs-panel/mysql/create.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/mysql/create.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mysql/delete.pl vhffs-agh/vhffs-panel/mysql/delete.pl
--- vhffs-542-nosvn/vhffs-panel/mysql/delete.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/mysql/delete.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/mysql/prefs.pl vhffs-agh/vhffs-panel/mysql/prefs.pl
--- vhffs-542-nosvn/vhffs-panel/mysql/prefs.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/mysql/prefs.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/mysql/prefs_save.pl vhffs-agh/vhffs-panel/mysql/prefs_save.pl
--- vhffs-542-nosvn/vhffs-panel/mysql/prefs_save.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/mysql/prefs_save.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/mysql/submit.pl vhffs-agh/vhffs-panel/mysql/submit.pl
--- vhffs-542-nosvn/vhffs-panel/mysql/submit.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/mysql/submit.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/object/upavatar.pl vhffs-agh/vhffs-panel/object/upavatar.pl
--- vhffs-542-nosvn/vhffs-panel/object/upavatar.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/object/upavatar.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl 
+#!%PERL% 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Object;
 use Vhffs::User;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/panel.pl vhffs-agh/vhffs-panel/panel.pl
--- vhffs-542-nosvn/vhffs-panel/panel.pl	2007-04-05 21:27:25.000000000 +0200
+++ vhffs-agh/vhffs-panel/panel.pl	2007-04-06 18:14:25.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/pgsql/create.pl vhffs-agh/vhffs-panel/pgsql/create.pl
--- vhffs-542-nosvn/vhffs-panel/pgsql/create.pl	2007-02-27 22:17:19.000000000 +0100
+++ vhffs-agh/vhffs-panel/pgsql/create.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/pgsql/delete.pl vhffs-agh/vhffs-panel/pgsql/delete.pl
--- vhffs-542-nosvn/vhffs-panel/pgsql/delete.pl	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-panel/pgsql/delete.pl	2007-04-06 18:38:54.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/pgsql/pgsql_submit.pl vhffs-agh/vhffs-panel/pgsql/pgsql_submit.pl
--- vhffs-542-nosvn/vhffs-panel/pgsql/pgsql_submit.pl	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-panel/pgsql/pgsql_submit.pl	2007-04-06 18:38:54.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/pgsql/prefs.pl vhffs-agh/vhffs-panel/pgsql/prefs.pl
--- vhffs-542-nosvn/vhffs-panel/pgsql/prefs.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/pgsql/prefs.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/pgsql/prefs_save.pl vhffs-agh/vhffs-panel/pgsql/prefs_save.pl
--- vhffs-542-nosvn/vhffs-panel/pgsql/prefs_save.pl	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-panel/pgsql/prefs_save.pl	2007-04-06 18:38:54.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/public/allgroups.pl vhffs-agh/vhffs-panel/public/allgroups.pl
--- vhffs-542-nosvn/vhffs-panel/public/allgroups.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/public/allgroups.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -36,7 +36,7 @@
 use Locale::gettext;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/public/allwebsites.pl vhffs-agh/vhffs-panel/public/allwebsites.pl
--- vhffs-542-nosvn/vhffs-panel/public/allwebsites.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/public/allwebsites.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -37,7 +37,7 @@
 use strict;
 use CGI;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/public/group.pl vhffs-agh/vhffs-panel/public/group.pl
--- vhffs-542-nosvn/vhffs-panel/public/group.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/public/group.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/public/index.pl vhffs-agh/vhffs-panel/public/index.pl
--- vhffs-542-nosvn/vhffs-panel/public/index.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/public/index.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -37,7 +37,7 @@
 use strict;
 use CGI;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/public/lastgroups.pl vhffs-agh/vhffs-panel/public/lastgroups.pl
--- vhffs-542-nosvn/vhffs-panel/public/lastgroups.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/public/lastgroups.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -36,7 +36,7 @@
 use Locale::gettext;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/public/lastusers.pl vhffs-agh/vhffs-panel/public/lastusers.pl
--- vhffs-542-nosvn/vhffs-panel/public/lastusers.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/public/lastusers.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -37,7 +37,7 @@
 use strict;
 use CGI;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/public/rss/lastgroups.pl vhffs-agh/vhffs-panel/public/rss/lastgroups.pl
--- vhffs-542-nosvn/vhffs-panel/public/rss/lastgroups.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/public/rss/lastgroups.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -31,7 +31,7 @@
 
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 
diff -Nru vhffs-542-nosvn/vhffs-panel/public/rss/lastusers.pl vhffs-agh/vhffs-panel/public/rss/lastusers.pl
--- vhffs-542-nosvn/vhffs-panel/public/rss/lastusers.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/public/rss/lastusers.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -31,7 +31,7 @@
 
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 
diff -Nru vhffs-542-nosvn/vhffs-panel/public/user.pl vhffs-agh/vhffs-panel/public/user.pl
--- vhffs-542-nosvn/vhffs-panel/public/user.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/public/user.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/public/websearch.pl vhffs-agh/vhffs-panel/public/websearch.pl
--- vhffs-542-nosvn/vhffs-panel/public/websearch.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/public/websearch.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -37,7 +37,7 @@
 use strict;
 use CGI;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/repository/create.pl vhffs-agh/vhffs-panel/repository/create.pl
--- vhffs-542-nosvn/vhffs-panel/repository/create.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-panel/repository/create.pl	2007-03-28 19:33:09.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/repository/delete.pl vhffs-agh/vhffs-panel/repository/delete.pl
--- vhffs-542-nosvn/vhffs-panel/repository/delete.pl	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-panel/repository/delete.pl	2007-04-06 18:38:54.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/repository/prefs.pl vhffs-agh/vhffs-panel/repository/prefs.pl
--- vhffs-542-nosvn/vhffs-panel/repository/prefs.pl	2007-03-28 19:59:20.000000000 +0200
+++ vhffs-agh/vhffs-panel/repository/prefs.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/repository/prefs_save.pl vhffs-agh/vhffs-panel/repository/prefs_save.pl
--- vhffs-542-nosvn/vhffs-panel/repository/prefs_save.pl	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-panel/repository/prefs_save.pl	2007-04-06 18:38:54.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/repository/quota_used.pl vhffs-agh/vhffs-panel/repository/quota_used.pl
--- vhffs-542-nosvn/vhffs-panel/repository/quota_used.pl	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-panel/repository/quota_used.pl	2007-04-06 18:38:54.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -42,7 +42,7 @@
 use GD::Text::Wrap;
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/repository/repository_submit.pl vhffs-agh/vhffs-panel/repository/repository_submit.pl
--- vhffs-542-nosvn/vhffs-panel/repository/repository_submit.pl	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-panel/repository/repository_submit.pl	2007-03-28 19:33:09.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -43,7 +43,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/show_code.pl vhffs-agh/vhffs-panel/show_code.pl
--- vhffs-542-nosvn/vhffs-panel/show_code.pl	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-panel/show_code.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -33,7 +33,7 @@
 use CGI;
 use GD;
 use GD::Text::Wrap;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Panel::Confirmation;
 
diff -Nru vhffs-542-nosvn/vhffs-panel/subscribe.pl vhffs-agh/vhffs-panel/subscribe.pl
--- vhffs-542-nosvn/vhffs-panel/subscribe.pl	2007-03-28 18:38:58.000000000 +0200
+++ vhffs-agh/vhffs-panel/subscribe.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -44,7 +44,7 @@
 use Locale::gettext;
 use HTML::Template;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Functions;
diff -Nru vhffs-542-nosvn/vhffs-panel/svn/create.pl vhffs-agh/vhffs-panel/svn/create.pl
--- vhffs-542-nosvn/vhffs-panel/svn/create.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/svn/create.pl	2007-03-28 19:33:11.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/svn/delete.pl vhffs-agh/vhffs-panel/svn/delete.pl
--- vhffs-542-nosvn/vhffs-panel/svn/delete.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/svn/delete.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/svn/prefs.pl vhffs-agh/vhffs-panel/svn/prefs.pl
--- vhffs-542-nosvn/vhffs-panel/svn/prefs.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/svn/prefs.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/svn/prefs_save.pl vhffs-agh/vhffs-panel/svn/prefs_save.pl
--- vhffs-542-nosvn/vhffs-panel/svn/prefs_save.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/svn/prefs_save.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -39,7 +39,7 @@
 use strict;
 use Data::Dumper;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/svn/svn_submit.pl vhffs-agh/vhffs-panel/svn/svn_submit.pl
--- vhffs-542-nosvn/vhffs-panel/svn/svn_submit.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/svn/svn_submit.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/user/delete.pl vhffs-agh/vhffs-panel/user/delete.pl
--- vhffs-542-nosvn/vhffs-panel/user/delete.pl	2007-02-27 22:17:20.000000000 +0100
+++ vhffs-agh/vhffs-panel/user/delete.pl	2007-03-28 19:33:14.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/user/prefs.pl vhffs-agh/vhffs-panel/user/prefs.pl
--- vhffs-542-nosvn/vhffs-panel/user/prefs.pl	2007-04-03 21:24:44.000000000 +0200
+++ vhffs-agh/vhffs-panel/user/prefs.pl	2007-04-03 21:31:06.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/web/create.pl vhffs-agh/vhffs-panel/web/create.pl
--- vhffs-542-nosvn/vhffs-panel/web/create.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/web/create.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Panel::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/web/delete.pl vhffs-agh/vhffs-panel/web/delete.pl
--- vhffs-542-nosvn/vhffs-panel/web/delete.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/web/delete.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/web/prefs.pl vhffs-agh/vhffs-panel/web/prefs.pl
--- vhffs-542-nosvn/vhffs-panel/web/prefs.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/web/prefs.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-panel/web/prefs_save.pl vhffs-agh/vhffs-panel/web/prefs_save.pl
--- vhffs-542-nosvn/vhffs-panel/web/prefs_save.pl	2007-02-27 22:17:18.000000000 +0100
+++ vhffs-agh/vhffs-panel/web/prefs_save.pl	2007-03-28 19:33:12.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-panel/web/web_submit.pl vhffs-agh/vhffs-panel/web/web_submit.pl
--- vhffs-542-nosvn/vhffs-panel/web/web_submit.pl	2007-03-28 19:59:21.000000000 +0200
+++ vhffs-agh/vhffs-panel/web/web_submit.pl	2007-04-03 21:11:17.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 use CGI::Session;
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-robots/Makefile.am vhffs-agh/vhffs-robots/Makefile.am
--- vhffs-542-nosvn/vhffs-robots/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-robots/Makefile.am	2007-04-03 21:11:16.000000000 +0200
@@ -0,0 +1,78 @@
+botsdir = @BOTSDIR@
+nobase_bots_DATA = \
+	misc/awstats_6.4_vhffs.patch \
+	misc/awstats_6.5_vhffs.patch \
+	misc/awstats_htaccess_example \
+	misc/awstats.sample \
+	misc/repository.awstats_6.4_vhffs.patch \
+	misc/repository.awstats_6.5_vhffs.patch \
+	misc/repository.awstats_htaccess_example \
+	misc/repository.awstats.sample \
+	misc/viewvc.conf.tmpl
+
+bots_SCRIPTS = \
+	src/create_cvs.pl \
+	src/create_dns.pl \
+	src/create_groups.pl \
+	src/create_homes.pl \
+	src/create_mail.pl \
+	src/create_ml.pl \
+	src/create_mysql.pl \
+	src/create_pgsql.pl \
+	src/create_repository.pl \
+	src/create_svn.pl \
+	src/create_viewvcconf.pl \
+	src/create_web.pl \
+	src/cvs_fixperms.pl \
+	src/delete_cvs.pl \
+	src/delete_dns.pl \
+	src/delete_group.pl \
+	src/delete_mail.pl \
+	src/delete_ml.pl \
+	src/delete_mysql.pl \
+	src/delete_pgsql.pl \
+	src/delete_repository.pl \
+	src/delete_svn.pl \
+	src/delete_users.pl \
+	src/delete_web.pl \
+	src/dump_mysql.pl \
+	src/fix_quota.pl \
+	src/fix_quota.pl \
+	src/fix_quota_repository.pl \
+	src/generate_repositorystats.pl \
+	src/generate_webstats.pl \
+	src/listengine_publicarchives.pl \
+	src/mailing.pl \
+	src/modify_mysql.pl \
+	src/modify_pgsql.pl \
+	src/refused_cvs.pl \
+	src/refused_dns.pl \
+	src/refused_groups.pl \
+	src/refused_mail.pl \
+	src/refused_ml.pl \
+	src/refused_mysql.pl \
+	src/refused_postgres.pl \
+	src/refused_repository.pl \
+	src/refused_svn.pl \
+	src/refused_web.pl \
+	src/svn_public.pl \
+	src/svn_websvn.pl \
+	src/update_quota_used.pl \
+	src/update_quota_used_repository.pl \
+	src/user_group.pl
+
+# Define the substitution we need to point perl script at correct location
+do_sed = $(SED) --in-place \
+	-e 's,%PERL%,$(PERL),g' \
+	-e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g'
+
+# Because automake, exec-hook is executed before install-scripts
+# so install-data is after. Here we use a data-hook
+install-data-hook :
+	for f in $(nobase_bots_DATA) ; do \
+		$(do_sed) $(DESTDIR)$(botsdir)/$$f; \
+	done
+	for f in $(bots_SCRIPTS) ; do \
+		nf=`echo $$f | sed 's,^.*/,,'`; \
+		$(do_sed) $(DESTDIR)$(botsdir)/$$nf; \
+	done
diff -Nru vhffs-542-nosvn/vhffs-robots/src/create_cvs.pl vhffs-agh/vhffs-robots/src/create_cvs.pl
--- vhffs-542-nosvn/vhffs-robots/src/create_cvs.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/create_cvs.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 
 
 # Copyright (c) vhffs project and its contributors
@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots::Cvs;
 use Vhffs::Robots;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/create_dns.pl vhffs-agh/vhffs-robots/src/create_dns.pl
--- vhffs-542-nosvn/vhffs-robots/src/create_dns.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/create_dns.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
diff -Nru vhffs-542-nosvn/vhffs-robots/src/create_groups.pl vhffs-agh/vhffs-robots/src/create_groups.pl
--- vhffs-542-nosvn/vhffs-robots/src/create_groups.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/create_groups.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
@@ -30,7 +30,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Group;
 use Vhffs::Robots;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/create_homes.pl vhffs-agh/vhffs-robots/src/create_homes.pl
--- vhffs-542-nosvn/vhffs-robots/src/create_homes.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/create_homes.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 
 #This robot creates home directory of each users
 # Copyright (c) vhffs project and its contributors
@@ -31,7 +31,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots::User;
 use Vhffs::Robots;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/create_mail.pl vhffs-agh/vhffs-robots/src/create_mail.pl
--- vhffs-542-nosvn/vhffs-robots/src/create_mail.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/create_mail.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-robots/src/create_ml.pl vhffs-agh/vhffs-robots/src/create_ml.pl
--- vhffs-542-nosvn/vhffs-robots/src/create_ml.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/create_ml.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
@@ -29,7 +29,7 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Robots;
 use Vhffs::Constants;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/create_mysql.pl vhffs-agh/vhffs-robots/src/create_mysql.pl
--- vhffs-542-nosvn/vhffs-robots/src/create_mysql.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/create_mysql.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -32,7 +32,7 @@
 use strict;
 use POSIX;
 use locale;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots;
 use Vhffs::Services::Mysql;
 use Vhffs::Robots::Mysql;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/create_pgsql.pl vhffs-agh/vhffs-robots/src/create_pgsql.pl
--- vhffs-542-nosvn/vhffs-robots/src/create_pgsql.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/create_pgsql.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -30,7 +30,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots::Postgres;
 use Vhffs::Main;
 use Vhffs::Robots;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/create_repository.pl vhffs-agh/vhffs-robots/src/create_repository.pl
--- vhffs-542-nosvn/vhffs-robots/src/create_repository.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/create_repository.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 
 
 # Copyright (c) vhffs project and its contributors
@@ -32,7 +32,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots::Repository;
 use Vhffs::Robots;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/create_svn.pl vhffs-agh/vhffs-robots/src/create_svn.pl
--- vhffs-542-nosvn/vhffs-robots/src/create_svn.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/create_svn.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -29,7 +29,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Robots;
 use Vhffs::Robots::Svn;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/create_viewvcconf.pl vhffs-agh/vhffs-robots/src/create_viewvcconf.pl
--- vhffs-542-nosvn/vhffs-robots/src/create_viewvcconf.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/create_viewvcconf.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -31,7 +31,7 @@
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Constants;
 use Vhffs::Services::Cvs;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/create_web.pl vhffs-agh/vhffs-robots/src/create_web.pl
--- vhffs-542-nosvn/vhffs-robots/src/create_web.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/create_web.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -30,7 +30,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots::Web;
 use Vhffs::Services::Httpd;
 use Vhffs::Robots;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/cvs_fixperms.pl vhffs-agh/vhffs-robots/src/cvs_fixperms.pl
--- vhffs-542-nosvn/vhffs-robots/src/cvs_fixperms.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/cvs_fixperms.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -38,7 +38,7 @@
 
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Robots;
 use Vhffs::Functions;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/delete_cvs.pl vhffs-agh/vhffs-robots/src/delete_cvs.pl
--- vhffs-542-nosvn/vhffs-robots/src/delete_cvs.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/delete_cvs.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -30,7 +30,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots::Cvs;
 use Vhffs::Services::Cvs;
 use Vhffs::Constants;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/delete_dns.pl vhffs-agh/vhffs-robots/src/delete_dns.pl
--- vhffs-542-nosvn/vhffs-robots/src/delete_dns.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/delete_dns.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -29,7 +29,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots;
 use Vhffs::Services::DNS;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/delete_group.pl vhffs-agh/vhffs-robots/src/delete_group.pl
--- vhffs-542-nosvn/vhffs-robots/src/delete_group.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/delete_group.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -30,7 +30,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots::Group;
 use Vhffs::Main;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/delete_mail.pl vhffs-agh/vhffs-robots/src/delete_mail.pl
--- vhffs-542-nosvn/vhffs-robots/src/delete_mail.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/delete_mail.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
diff -Nru vhffs-542-nosvn/vhffs-robots/src/delete_ml.pl vhffs-agh/vhffs-robots/src/delete_ml.pl
--- vhffs-542-nosvn/vhffs-robots/src/delete_ml.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/delete_ml.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -30,7 +30,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Constants;
 use Vhffs::Robots;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/delete_mysql.pl vhffs-agh/vhffs-robots/src/delete_mysql.pl
--- vhffs-542-nosvn/vhffs-robots/src/delete_mysql.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/delete_mysql.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -29,7 +29,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots;
 use Vhffs::Robots::Mysql;
 use Vhffs::Services::Mysql;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/delete_pgsql.pl vhffs-agh/vhffs-robots/src/delete_pgsql.pl
--- vhffs-542-nosvn/vhffs-robots/src/delete_pgsql.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/delete_pgsql.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -29,7 +29,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots;
 use Vhffs::Services::Postgres;
 use Vhffs::Robots::Postgres;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/delete_repository.pl vhffs-agh/vhffs-robots/src/delete_repository.pl
--- vhffs-542-nosvn/vhffs-robots/src/delete_repository.pl	2007-03-28 18:38:57.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/delete_repository.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -30,7 +30,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots::Repository;
 use Vhffs::Services::Repository;
 use Vhffs::Constants;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/delete_svn.pl vhffs-agh/vhffs-robots/src/delete_svn.pl
--- vhffs-542-nosvn/vhffs-robots/src/delete_svn.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/delete_svn.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -29,7 +29,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Robots;
 use Vhffs::Robots::Svn;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/delete_users.pl vhffs-agh/vhffs-robots/src/delete_users.pl
--- vhffs-542-nosvn/vhffs-robots/src/delete_users.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/delete_users.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -29,7 +29,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots qw( lock unlock vhffs_log );
 use Vhffs::Robots::User;
 use Vhffs::User;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/delete_web.pl vhffs-agh/vhffs-robots/src/delete_web.pl
--- vhffs-542-nosvn/vhffs-robots/src/delete_web.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/delete_web.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -29,7 +29,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots;
 use Vhffs::Robots::Web;
 use Vhffs::Services::Httpd;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/dump_mysql.pl vhffs-agh/vhffs-robots/src/dump_mysql.pl
--- vhffs-542-nosvn/vhffs-robots/src/dump_mysql.pl	2007-03-28 18:49:01.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/dump_mysql.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -35,7 +35,7 @@
 #
 
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/fix_quota.pl vhffs-agh/vhffs-robots/src/fix_quota.pl
--- vhffs-542-nosvn/vhffs-robots/src/fix_quota.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/fix_quota.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -35,7 +35,7 @@
 use locale;
 use Locale::gettext;
 use Quota;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Robots;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/fix_quota_repository.pl vhffs-agh/vhffs-robots/src/fix_quota_repository.pl
--- vhffs-542-nosvn/vhffs-robots/src/fix_quota_repository.pl	2007-03-28 18:38:57.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/fix_quota_repository.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -34,7 +34,7 @@
 use POSIX;
 use locale;
 use Locale::gettext;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Robots;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/generate_webstats.pl vhffs-agh/vhffs-robots/src/generate_webstats.pl
--- vhffs-542-nosvn/vhffs-robots/src/generate_webstats.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/generate_webstats.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -36,7 +36,7 @@
 #CustomLog /var/log/apache2/vhffs.log vhffs
 
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Conf;
 use Vhffs::Functions;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/listengine_publicarchives.pl vhffs-agh/vhffs-robots/src/listengine_publicarchives.pl
--- vhffs-542-nosvn/vhffs-robots/src/listengine_publicarchives.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/listengine_publicarchives.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,8 +1,8 @@
-#!/usr/bin/perl -w 
+#!%PERL% -w 
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Group;
 use Vhffs::Functions;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/mailing.pl vhffs-agh/vhffs-robots/src/mailing.pl
--- vhffs-542-nosvn/vhffs-robots/src/mailing.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/mailing.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -42,7 +42,7 @@
 use strict;
 use Encode;
 use utf8;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Functions;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/modify_mysql.pl vhffs-agh/vhffs-robots/src/modify_mysql.pl
--- vhffs-542-nosvn/vhffs-robots/src/modify_mysql.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/modify_mysql.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -29,7 +29,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots;
 use Vhffs::Robots::Mysql;
 use Vhffs::Services::Mysql;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/modify_pgsql.pl vhffs-agh/vhffs-robots/src/modify_pgsql.pl
--- vhffs-542-nosvn/vhffs-robots/src/modify_pgsql.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/modify_pgsql.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -30,7 +30,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Robots;
 use Vhffs::Services::Postgres;
 use Vhffs::Robots::Postgres;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/refused_cvs.pl vhffs-agh/vhffs-robots/src/refused_cvs.pl
--- vhffs-542-nosvn/vhffs-robots/src/refused_cvs.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/refused_cvs.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -33,7 +33,7 @@
 use locale;
 use Locale::gettext;
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/refused_dns.pl vhffs-agh/vhffs-robots/src/refused_dns.pl
--- vhffs-542-nosvn/vhffs-robots/src/refused_dns.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/refused_dns.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -33,7 +33,7 @@
 use locale;
 use Locale::gettext;
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Robots;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/refused_groups.pl vhffs-agh/vhffs-robots/src/refused_groups.pl
--- vhffs-542-nosvn/vhffs-robots/src/refused_groups.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/refused_groups.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -33,7 +33,7 @@
 use locale;
 use Locale::gettext;
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/refused_mail.pl vhffs-agh/vhffs-robots/src/refused_mail.pl
--- vhffs-542-nosvn/vhffs-robots/src/refused_mail.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/refused_mail.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -33,7 +33,7 @@
 use locale;
 use Locale::gettext;
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/refused_ml.pl vhffs-agh/vhffs-robots/src/refused_ml.pl
--- vhffs-542-nosvn/vhffs-robots/src/refused_ml.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/refused_ml.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -33,7 +33,7 @@
 use locale;
 use Locale::gettext;
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Robots;
 use Vhffs::User;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/refused_mysql.pl vhffs-agh/vhffs-robots/src/refused_mysql.pl
--- vhffs-542-nosvn/vhffs-robots/src/refused_mysql.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/refused_mysql.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl
+#!%PERL%
 
 use strict;
 use POSIX qw(locale_h);
 use locale;
 use Locale::gettext;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/refused_postgres.pl vhffs-agh/vhffs-robots/src/refused_postgres.pl
--- vhffs-542-nosvn/vhffs-robots/src/refused_postgres.pl	2007-03-28 18:38:57.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/refused_postgres.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -33,7 +33,7 @@
 use locale;
 use Locale::gettext;
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/refused_repository.pl vhffs-agh/vhffs-robots/src/refused_repository.pl
--- vhffs-542-nosvn/vhffs-robots/src/refused_repository.pl	2007-03-28 18:38:57.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/refused_repository.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -33,7 +33,7 @@
 use locale;
 use Locale::gettext;
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/refused_svn.pl vhffs-agh/vhffs-robots/src/refused_svn.pl
--- vhffs-542-nosvn/vhffs-robots/src/refused_svn.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/refused_svn.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,10 +1,10 @@
-#!/usr/bin/perl
+#!%PERL%
 
 use POSIX qw(locale_h);
 use locale;
 use Locale::gettext;
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/refused_web.pl vhffs-agh/vhffs-robots/src/refused_web.pl
--- vhffs-542-nosvn/vhffs-robots/src/refused_web.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/refused_web.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -33,7 +33,7 @@
 use locale;
 use Locale::gettext;
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/svn_public.pl vhffs-agh/vhffs-robots/src/svn_public.pl
--- vhffs-542-nosvn/vhffs-robots/src/svn_public.pl	2007-03-28 19:59:19.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/svn_public.pl	2007-04-03 21:11:16.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -29,7 +29,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Robots;
 use Vhffs::Robots::Svn;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/svn_websvn.pl vhffs-agh/vhffs-robots/src/svn_websvn.pl
--- vhffs-542-nosvn/vhffs-robots/src/svn_websvn.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/svn_websvn.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -31,7 +31,7 @@
 
 use strict;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Constants;
 use Vhffs::Services::Svn;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/update_quota_used.pl vhffs-agh/vhffs-robots/src/update_quota_used.pl
--- vhffs-542-nosvn/vhffs-robots/src/update_quota_used.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/update_quota_used.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -35,7 +35,7 @@
 use locale;
 use Locale::gettext;
 use Quota;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Robots;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/update_quota_used_repository.pl vhffs-agh/vhffs-robots/src/update_quota_used_repository.pl
--- vhffs-542-nosvn/vhffs-robots/src/update_quota_used_repository.pl	2007-03-28 18:38:57.000000000 +0200
+++ vhffs-agh/vhffs-robots/src/update_quota_used_repository.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -34,7 +34,7 @@
 use POSIX;
 use locale;
 use Locale::gettext;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Robots;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-robots/src/user_group.pl vhffs-agh/vhffs-robots/src/user_group.pl
--- vhffs-542-nosvn/vhffs-robots/src/user_group.pl	2007-02-27 22:17:13.000000000 +0100
+++ vhffs-agh/vhffs-robots/src/user_group.pl	2007-03-28 19:32:35.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -29,7 +29,7 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 # POSSIBILITY OF SUCH DAMAGE.
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::User;
 use Vhffs::Group;
diff -Nru vhffs-542-nosvn/vhffs-shells/Makefile vhffs-agh/vhffs-shells/Makefile
--- vhffs-542-nosvn/vhffs-shells/Makefile	2007-02-27 22:17:16.000000000 +0100
+++ vhffs-agh/vhffs-shells/Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without 
-# modification, are permitted provided that the following conditions 
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright 
-#   notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in 
-#   the documentation and/or other materials provided with the 
-#   distribution.
-#3. Neither the name of vhffs nor the names of its contributors 
-#   may be used to endorse or promote products derived from this 
-#   software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-# POSSIBILITY OF SUCH DAMAGE.
-
-.SUFFIXES = .c
-
-tuxshell: tuxshell.c
-	gcc -Wall -pedantic -o $@ $<
-
-all: tuxshell
-
-clean:
-	rm -f tuxshell
diff -Nru vhffs-542-nosvn/vhffs-shells/Makefile.am vhffs-agh/vhffs-shells/Makefile.am
--- vhffs-542-nosvn/vhffs-shells/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-shells/Makefile.am	2007-03-28 19:33:09.000000000 +0200
@@ -0,0 +1,3 @@
+.SUFFIXES = .c
+bindir = @SHELLDIR@
+bin_PROGRAMS = tuxshell
diff -Nru vhffs-542-nosvn/vhffs-test-dependencies.in vhffs-agh/vhffs-test-dependencies.in
--- vhffs-542-nosvn/vhffs-test-dependencies.in	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-test-dependencies.in	2007-04-06 18:14:25.000000000 +0200
@@ -0,0 +1,239 @@
+#!@PERL@
+# Copyright here
+
+use strict;
+use Getopt::Long;
+my %args;
+my %dep;
+my @components;
+
+$dep{'api'} = [ 
+	('Encode', ''),
+	('utf8', ''),
+	('diagnostics', ''),
+	('DBI', ''),
+	('DBD::Pg', ''),
+	('Locale::gettext', ''),
+	('Digest::MD5', ''),
+	('MIME::Lite', ''),
+	('Crypt::PasswdMD5', ''),
+	('Email::Valid', ''),
+	('File::Basename', ''),
+	('LockFile::Simple', ''),
+	('Mail::Internet', ''),
+	('HTML::Template', ''),
+	('CGI', ''),
+	('CGI::Session', '')];
+
+$dep{'irc'} = [
+	('Data::Dumper',''),
+	('Net::IRC',''),
+	('Text::Wrapper','')];
+
+$dep{'jabber'} = [ 'MIME::Base64' ];
+
+$dep{'listengine'} = [
+	('Net::SMTP', ''),
+	('Socket', '')];
+
+$dep{'panel'} = [
+	('GD', ''),
+	('GD::Text::Wrap', '')];
+
+&GetOptions( \%args,
+	'u|usage',
+	'h|help', 
+	'v|verbose',
+	'install',
+	'install-cmd=s',
+	'verify=s'
+);
+
+usage() if ( ($args{'u'}) or ($args{'h'}) );
+$args{'verify'} = 'api' if (!$args{'verify'});
+
+if ( $args{'verify'} eq 'all') {
+	@components = ('api', 'irc', 'jabber', 'listengine', 'panel');
+} else {
+	@components = split ( /,/, $args{'verify'});
+}
+
+
+# Test block. This allow to define tested module only once
+{
+	my $module;
+	my $all_ok = 1;
+	
+	sub print_component {
+		$_ = shift;
+		print "\n*** $_\n";
+	}
+	
+	# Call with 3 paramters :
+	# -msg : What we have to say
+	# -bad : 1 if module not present or not usable
+	# -comment : comments
+	sub print_result {
+	my $msg = shift;
+	my $bad = shift;
+	my $comment = shift;
+
+	$all_ok = 0 if ($bad);
+	if ($args{'v'} or $bad) {
+		print "        $msg";
+		print $bad ? " -> BAD MODULE" : " -> OK";
+		print "\n";
+	}
+	print "\t\t$comment\n" if defined $comment;
+}
+	
+	sub finished {
+		print "\n\n----------- Results : -----------\n";
+		if ($all_ok) {
+			print "Congratulations, all required perl modules are found and valid.\n";
+		} else {
+			print "Your system cannot run vhffs in its current state.\n";
+			print "Check previous messages to see what fails.\n";
+			print "note : if you run tests with --install-missings, you should be ok\n"
+		}
+	}
+}
+
+check_perl();
+
+# Now process each dependencies block
+foreach (@components) {
+	print_component ("$_");
+	
+	my @d = @{ $dep{$_} };
+	while (@d) {
+		my $module = shift @d;
+		my $version = shift @d;
+		my $ret = check_module($module, $version);
+
+		if ((!$ret) and ( $args{'install'} ) ) {
+			install_module ($module, $version);
+		}
+	}
+}
+
+finished();
+
+# ----------------------------- functions --------------------------------------
+sub usage {
+	print << '.';
+
+This program helps to detect perl modules and their versions
+to be sure we can run VHFFS on this computer.
+
+Options :
+  --install         Will install missing dependencies (*not recommmended*)
+  --install-cmd     Specify a command for installing perl modules (see below)
+  --verbose         Print all perl modules checked, not only the missings.
+  --verify          A list of vhffs component to verify deps
+
+  Supported vhffs components are :
+    . api (default)
+    . irc
+    . jabber
+    . listengine
+    . panel
+    . all (all of the above)
+                    
+	
+
+Installing dependencies :
+=========================
+Installing dependencies will be done with CPAN commands, if you are using
+the --install argument.
+
+You can add the --install-cmd="cmd", that let you specify a external program
+for installing missing dependencies, this is recommended since you can use
+your regular package management to take care of dependencies. This program will
+be called with the missing perl module as argument, or ir the string passed
+contain a '%s', will replace the "%s" with the module name ebcore calling it.
+
+Example :
+---------
+
+On Gentoo with g-cpan : 
+ ./vhffs-test-dependencies --verify=irc --install --install-cmd="g-cpan -i %s"
+
+On any Linux, using perl CPAN :
+ ./vhffs-test-dependencies --verify=all --install
+
+
+.
+exit();
+}
+
+# Should we verify a particular version of perl ?
+sub check_perl {
+	print_component ('perl');
+	eval {require 5};
+	print_result( "version : $]", 0);
+}
+
+sub check_module {
+	my $module = shift;
+	my $version = shift;
+
+	eval "use $module $version ()";
+	if ($@) {
+		my $errstr = $@;
+		$errstr =~ s/\n(.*)$//s;
+		print_result("module : $module $version", 1, $errstr);
+		return 0;
+	} else {
+		# TODO : Check version number
+		my $msg = "module : $module";
+		$msg .= " >=$version" if $version;
+		print_result($msg, 0);
+		return 1;
+	}
+}
+
+sub install_module {
+	my $module = shift;
+	my $version = shift;
+	
+	print "About to install $module\n";
+	
+	if ($args{'install-cmd'}) {
+		my $cmd = $args{'install-cmd'};
+		if( $cmd =~ /\%s/) {
+			$cmd =~ s/\%s/$module/g;
+		} else {
+			$cmd .= " $module";	
+		}
+		
+		# We now got the command 
+		print 'Command to execute :<' . $cmd . ">\n";
+		return scalar `$cmd 1>&2`;
+	} else {
+		# Regular CPAN install
+		my $ok = 1;
+		{
+			$ok = eval { require CPAN::MyConfig } || eval { require CPAN::Config };
+		}
+		
+        if (! $ok) {
+			print << 'FIN';
+Error while runnig CPAN access. Please configure your CPAN or setup your $HOME.
+Run `perl -MCPAN -e shell` to configure CPAN
+FIN
+ 			exit(1);
+		}
+		$ok = eval { require CPAN; CPAN::Shell->install($module) };
+		return $ok unless $@;
+
+		print << 'FIN';
+We got problem while installing your $module.
+Error string was :
+$@
+FIN
+		exit (1);
+	}
+}
+
+
diff -Nru vhffs-542-nosvn/vhffs-tests/Makefile.am vhffs-agh/vhffs-tests/Makefile.am
--- vhffs-542-nosvn/vhffs-tests/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-tests/Makefile.am	2007-04-06 18:14:25.000000000 +0200
@@ -0,0 +1 @@
+SUBDIRS = src
\ Pas de fin de ligne à la fin du fichier.
diff -Nru vhffs-542-nosvn/vhffs-tests/src/Makefile.am vhffs-agh/vhffs-tests/src/Makefile.am
--- vhffs-542-nosvn/vhffs-tests/src/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-tests/src/Makefile.am	2007-04-06 18:14:25.000000000 +0200
@@ -0,0 +1,5 @@
+TESTS_ENVIRONMENT = @PERL@ -I . -I ../../vhffs-api/src/
+TESTS = Object.pl Group.pl User.pl Stats.pl Services/Svn.pl \
+	Services/Cvs.pl Services/Httpd.pl Services/DNS.pl Services/Mail.pl \
+	Services/Mailing.pl Services/Mysql.pl Services/Postgres.pl \
+	Functions.pl Services/Repository.pl
diff -Nru vhffs-542-nosvn/vhffs-tests/src/Vhffs/Tests/Main.pm vhffs-agh/vhffs-tests/src/Vhffs/Tests/Main.pm
--- vhffs-542-nosvn/vhffs-tests/src/Vhffs/Tests/Main.pm	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tests/src/Vhffs/Tests/Main.pm	2007-04-06 18:14:25.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 # Copyright (c) vhffs project and its contributors
 # All rights reserved.
 #
@@ -41,7 +41,7 @@
 
 use constant
 {
-    VHFFSCONFPATH => "vhffs-tests/conf/vhffs.conf"
+    VHFFSCONFPATH => "../conf/vhffs.conf"
 };
 
 
diff -Nru vhffs-542-nosvn/vhffs-tools/Makefile.am vhffs-agh/vhffs-tools/Makefile.am
--- vhffs-542-nosvn/vhffs-tools/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-tools/Makefile.am	2007-03-28 19:33:14.000000000 +0200
@@ -0,0 +1,2 @@
+SUBDIRS = src
+DIST_SUBDIRS = src mans
diff -Nru vhffs-542-nosvn/vhffs-tools/src/Makefile.am vhffs-agh/vhffs-tools/src/Makefile.am
--- vhffs-542-nosvn/vhffs-tools/src/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/Makefile.am	2007-04-06 18:14:25.000000000 +0200
@@ -0,0 +1,27 @@
+toolsdir = @TOOLSDIR@
+tools_SCRIPTS = \
+	vhffs-blankmysql \
+	vhffs-checkinstall \
+	vhffs-dumpmysql \
+	vhffs-groupdel \
+	vhffs-groupinfo \
+	vhffs-makeadmin \
+	vhffs-moderate \
+	vhffs-passwd \
+	vhffs-quota \
+	vhffs-userdel \
+	vhffs-userinfo \
+	vhffs-usermod \
+	vhffs-webdir
+	
+# Define the substitution we need to point perl script at correct location
+do_sed = $(SED) --in-place \
+	-e 's,%PERL%,$(PERL),g' \
+	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g'
+
+# Because automake, exec-hook is executed before install-scripts
+# so install-data is after. Here we use a data-hook
+install-data-hook :
+	for f in $(tools_SCRIPTS) ; do \
+		$(do_sed) $(DESTDIR)$(toolsdir)/$$f; \
+	done
\ Pas de fin de ligne à la fin du fichier.
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-blankmysql vhffs-agh/vhffs-tools/src/vhffs-blankmysql
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-blankmysql	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/vhffs-blankmysql	2007-04-06 18:14:25.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 
 ##############################################################################
 # This binary blank all databases password for MySQL database
@@ -6,7 +6,7 @@
 # Use as it : blank_mysql
 
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Constants;
 use Vhffs::Functions;
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-checkinstall vhffs-agh/vhffs-tools/src/vhffs-checkinstall
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-checkinstall	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/vhffs-checkinstall	2007-04-06 18:14:25.000000000 +0200
@@ -1,9 +1,9 @@
-#!/usr/bin/perl
+#!%PERL%
 
 #Wrote by soda <god@xxxxxxxxx>
 
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 
 my @DEPS = qw(HTML::Template Digest::MD5 CGI Locale::gettext Config::General DBI Email::Valid Crypt::PasswdMD5 GD::Text::Wrap GD MIME::Lite XML::RSS CGI::Session Encode utf8);
 my $dep;
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-dumpmysql vhffs-agh/vhffs-tools/src/vhffs-dumpmysql
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-dumpmysql	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/vhffs-dumpmysql	2007-04-06 18:14:25.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 
 PAS FINI
 
@@ -9,7 +9,7 @@
 # Use as it : dump_mysql database_name
 
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Constants;
 use Vhffs::Functions;
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-groupdel vhffs-agh/vhffs-tools/src/vhffs-groupdel
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-groupdel	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/vhffs-groupdel	2007-04-06 18:14:25.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Group;
 use Vhffs::Main;
 use Vhffs::Constants;
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-groupinfo vhffs-agh/vhffs-tools/src/vhffs-groupinfo
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-groupinfo	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/vhffs-groupinfo	2007-04-06 18:14:25.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Group;
 use Vhffs::Main;
 
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-makeadmin vhffs-agh/vhffs-tools/src/vhffs-makeadmin
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-makeadmin	2007-04-05 21:27:25.000000000 +0200
+++ vhffs-agh/vhffs-tools/src/vhffs-makeadmin	2007-04-06 18:14:25.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Constants;
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-moderate vhffs-agh/vhffs-tools/src/vhffs-moderate
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-moderate	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/vhffs-moderate	2007-04-06 18:14:25.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!%PERL% -w
 
 use POSIX qw(locale_h);
 use locale;
@@ -6,7 +6,7 @@
 use Locale::gettext;
 use Data::Dumper;
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Group;
 use Vhffs::Main;
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-passwd vhffs-agh/vhffs-tools/src/vhffs-passwd
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-passwd	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/vhffs-passwd	2007-04-06 18:14:25.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-quota vhffs-agh/vhffs-tools/src/vhffs-quota
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-quota	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/vhffs-quota	2007-04-06 18:14:25.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 
 
 #This is a part of VHFFS distribution
@@ -6,7 +6,7 @@
 
 
 #Use some VHFFS modules, it can be useful
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Group;
 
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-userdel vhffs-agh/vhffs-tools/src/vhffs-userdel
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-userdel	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/vhffs-userdel	2007-04-06 18:14:25.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Constants;
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-userinfo vhffs-agh/vhffs-tools/src/vhffs-userinfo
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-userinfo	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/vhffs-userinfo	2007-04-06 18:14:25.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Functions;
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-usermod vhffs-agh/vhffs-tools/src/vhffs-usermod
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-usermod	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/vhffs-usermod	2007-04-06 18:14:25.000000000 +0200
@@ -1,6 +1,6 @@
-#!/usr/bin/perl
+#!%PERL%
 
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::User;
 use Vhffs::Main;
 use Vhffs::Constants;
diff -Nru vhffs-542-nosvn/vhffs-tools/src/vhffs-webdir vhffs-agh/vhffs-tools/src/vhffs-webdir
--- vhffs-542-nosvn/vhffs-tools/src/vhffs-webdir	2007-02-27 22:17:21.000000000 +0100
+++ vhffs-agh/vhffs-tools/src/vhffs-webdir	2007-04-06 18:14:25.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%PERL%
 
 ##############################################################################
 # This binary change directory to the specified website passed trough argument
@@ -6,7 +6,7 @@
 # Use as it : webdir toto.tuxfamily.org
 
 use strict;
-use lib "/usr/share/vhffs/api/";
+use lib '%VHFFS_LIB_DIR%';
 use Vhffs::Main;
 use Vhffs::Constants;
 use Vhffs::Functions;