pf-tools commit: r456 [ccaillet-guest] - in /trunk: Makefile dumpiplist.pl installers/ pflaunch tools/ umlaunch

[parmelan-guest at users.alioth.debian.org]

Author: ccaillet-guest
Date: Mon Mar  5 16:15:50 2007
New Revision: 456

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=456
Log:
Adding tools and installers directories

Added:
    trunk/installers/
    trunk/tools/
Modified:
    trunk/Makefile
    trunk/dumpiplist.pl
    trunk/pflaunch
    trunk/umlaunch

Modified: trunk/Makefile
URL: http://svn.debian.org/wsvn/pf-tools/trunk/Makefile?rev=456&op=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Mar  5 16:15:50 2007
@@ -4,10 +4,13 @@
 SBIN_DIR=$(DESTDIR)/usr/sbin
 FILTERS_DIR=$(DESTDIR)/usr/sbin
 CONF_DIR=$(DESTDIR)/etc
+INSTALLERS_DIR=$(DESTDIR)/usr/local/share/pf-tools
 
 SBIN=sbin/*
 FILTERS=filters/*
 LIB=lib/PFTools/*
+TOOLS=tools/*
+INSTALLERS=installers/*
 CONF=conf/*
 
 
@@ -49,10 +52,15 @@
 	mkdir -p $(CONF_DIR)
 	install -o root -g root -m 600 $(CONF) $(CONF_DIR)/pf-tools.conf.new
 
-install_host: $(SBIN_HOST)
-	install -d $(DESTDIR)/usr/local/sbin/
+install_host: $(TOOLS)
+	# PFHost tools
+	mkdir -p $(SBIN_DIR)
+	install --owner=root --group=root --mode=0755 $(TOOLS) $(SBIN_DIR)
+
+	# PFHost installers
+	mkdir -p $(INSTALLERS_DIR)
+	install --owner=root --group=root --mode=0755 $(INSTALLERS) $(INSTALLERS_DIR)
+
+	# PFHost config files sample
 	install -d $(DESTDIR)/usr/share/doc/pf-host/
-	install -o root -g root -m 700 -d $(DESTDIR)/usr/local/share/pf-tools
-	install $(SBIN_HOST) $(DESTDIR)/usr/local/sbin/
-	install install install.dist-2.6 $(DESTDIR)/usr/local/share/pf-tools
 	install $(DOC_HOST) $(DESTDIR)/usr/share/doc/pf-host/

Modified: trunk/dumpiplist.pl
URL: http://svn.debian.org/wsvn/pf-tools/trunk/dumpiplist.pl?rev=456&op=diff
==============================================================================
--- trunk/dumpiplist.pl (original)
+++ trunk/dumpiplist.pl Mon Mar  5 16:15:50 2007
@@ -33,8 +33,8 @@
 	our $UML = 1;
 }
 
-require("lib-net");
-require("lib-conf");
+use PFTools::Net ;
+use PFTools::Update ;
 
 sub _ipcomp 
 {

Modified: trunk/pflaunch
URL: http://svn.debian.org/wsvn/pf-tools/trunk/pflaunch?rev=456&op=diff
==============================================================================
--- trunk/pflaunch (original)
+++ trunk/pflaunch Mon Mar  5 16:15:50 2007
@@ -41,8 +41,8 @@
 
 use Sitalibs::Config;
 
-require "lib-net"; # pour Address()
-require "lib-update";
+use PFTools::Net ;
+use PFTools::Update ;
 
 my $HOSTNAME		= hostname;
 

Modified: trunk/umlaunch
URL: http://svn.debian.org/wsvn/pf-tools/trunk/umlaunch?rev=456&op=diff
==============================================================================
--- trunk/umlaunch (original)
+++ trunk/umlaunch Mon Mar  5 16:15:50 2007
@@ -26,6 +26,9 @@
 
 use Getopt::Long;
 use Socket;
+use PFTools::Conf ;
+use PFTools::Net ;
+use PFTools::Update ;
 
 # RAM par défaut pour les UML en Mo
 my $mem      = "128";
@@ -50,9 +53,6 @@
 # "our" et non "my" car cette variable est utilisée dans les lib-* :(
 our $UML = 1;
 
-require("lib-conf");
-require("lib-net");
-require("lib-update");
 
 my $options;
 $options->{errors}     = 1;