pf-tools commit: r450 [ccaillet-guest] - in /trunk: Makefile conf/pf-tools.conf cvs_rsh debian/rules pf-tools.conf sbin/cvs_rsh

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

Author: ccaillet-guest
Date: Mon Mar  5 15:45:56 2007
New Revision: 450

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=450
Log:
Modifying makefile and some other mods

Added:
    trunk/conf/pf-tools.conf
      - copied unchanged from r440, trunk/pf-tools.conf
    trunk/sbin/cvs_rsh
      - copied unchanged from r440, trunk/cvs_rsh
Removed:
    trunk/cvs_rsh
    trunk/pf-tools.conf
Modified:
    trunk/Makefile
    trunk/debian/rules

Modified: trunk/Makefile
URL: http://svn.debian.org/wsvn/pf-tools/trunk/Makefile?rev=450&op=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Mar  5 15:45:56 2007
@@ -1,25 +1,53 @@
 #! /usr/bin/make -f
 
-SBIN=cvs_rsh filter_filename filter_privateresolve filter_vlan2if mk_dhcp mk_pxelinuxcfg mk_interfaces mk_packages mk_privatezone mk_resolvconf mkrdns update-config
-LIB=lib-conf lib-net lib-update
-CONF=pf-tools.conf
+LIB_DIR=$(DESTDIR)/usr/share/perl5/PFTools
+SBIN_DIR=$(DESTDIR)/usr/sbin
+FILTERS_DIR=$(DESTDIR)/usr/sbin
+CONF_DIR=$(DESTDIR)/etc
+
+SBIN=sbin/*
+FILTERS=filters/*
+LIB=lib/PFTools/*
+CONF=conf/*
 
 
 SBIN_HOST=umlaunch pflaunch dumpiplist.pl bridge.sh
 DOC_HOST=pflaunch.cfg
 
-all:
+default:
+	# rien
 
+deb:
+	debuild -us -uc -b
 
-install: install_tools install_host 
+debclean:
+	fakeroot debian/rules clean
 
-install_tools: $(SBIN) $(LIB)
-	install -d $(DESTDIR)/usr/local/sbin/
-	install -d $(DESTDIR)/usr/local/lib/site_perl/
-	install -d $(DESTDIR)/etc/
-	install $(SBIN) $(DESTDIR)/usr/local/sbin/
-	install $(LIB) $(DESTDIR)/usr/local/lib/site_perl/
-	install -o root -g root -m 600 $(CONF) $(DESTDIR)/etc/$(CONF).new
+clean:
+realclean:
+	# rien pour l'instant
+
+test:
+	perl -I./lib -e 'use Test::Harness qw(&runtests $$verbose); $$verbose=1; runtests @ARGV;' t/*.t 2>/dev/null
+
+install: install_tools install_host
+
+install_tools: $(LIB) $(SBIN)
+	# PFTools modules
+	mkdir -p $(LIB_DIR)
+	install --mode=0644 $(LIB) $(LIB_DIR)
+	
+	# PFTools utils
+	mkdir -p $(SBIN_DIR)
+	install --owner=root --group=root --mode=0755 $(SBIN) $(SBIN_DIR)
+	
+	# PFTools Filters
+	mkdir -p $(FILTERS_DIR)
+	install --owner=root --group=root --mode=0755 $(FILTERS) $(FILTERS_DIR)
+	
+	# PFTools Config file
+	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/
@@ -28,7 +56,3 @@
 	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/
-
-deb:
-	dpkg-buildpackage -rfakeroot -us -uc
-

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/rules?rev=450&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Mon Mar  5 15:45:56 2007
@@ -6,9 +6,7 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=1
-
-DESTDIR=$(CURDIR)/debian/tmp
+DESTDIR=$(CURDIR)/debian/pf-tools
 DESTDIRHOST=$(CURDIR)/debian/pf-host
 
 build: build-stamp