From c32508e67bb56fb59c85e7fe298610656756b393 Mon Sep 17 00:00:00 2001
From: damiano
Date: Mon, 28 Dec 1998 15:48:35 +0000
Subject: Correction de debian/rules et src/Makefile

---
 debian/changelog | 2 +-
 debian/rules     | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 7d36f03..f8f9f64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ivy-c (1.1.1-1) unstable; urgency=low
+ivy-c (1.2-1) unstable; urgency=low
 
   * Mise au propre
   * Ajout du mecanisme de choix des adresses de broadcast
diff --git a/debian/rules b/debian/rules
index 6b5213a..f687d25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,9 @@
 
 package=ivy-c
 
-SED_COMMAND_VERSION='s/.*(\([^)]*\)).*/\1/p'
-VERSION := $(shell sed -n $(SED_COMMAND_VERSION) debian/changelog | head -1 | sed -n 's/\([0-9]*\)\..*/\1/p')
-SED_COMMAND_MAJOR_MINOR='s/.*(\([^)]*\)).*/\1/p'
-MAJOR_MINOR := $(shell sed -n $(SED_COMMAND_MAJOR_MINOR) debian/changelog | head -1 | sed -n 's/[0-9]*\.\([0-9\.]*\).*/\1/p')
+SED_COMMAND='s/.*(\([^)]*\)).*/\1/p'
+MAJOR := $(shell sed -n $(SED_COMMAND) debian/changelog | head -1 | sed -n 's/\([0-9]*\)\..*/\1/p')
+MINOR := $(shell sed -n $(SED_COMMAND) debian/changelog | head -1 | sed -n 's/[0-9]*\.\([0-9\.]*\).*/\1/p')
 
 build:
 	$(checkdir)
@@ -35,7 +34,7 @@ binary-arch:	checkroot build
 	install -d debian/tmp
 	cd debian/tmp && install -d `cat ../dirs`
 
-	cd src && make install DESTDIR=`pwd`/../debian/tmp VERSION=$(VERSION) MAJOR_MINOR=$(MAJOR_MINOR)
+	cd src && make install DESTDIR=`pwd`/../debian/tmp MAJOR=$(MAJOR) MINOR=$(MINOR)
 
 	debstd
 	-rmdir debian/tmp/usr/include
-- 
cgit v1.1