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 ++++-----
 src/Makefile     | 33 ++++++++++++++++++++-------------
 3 files changed, 25 insertions(+), 19 deletions(-)

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
diff --git a/src/Makefile b/src/Makefile
index 40d7b7c..aff6ada 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,6 +17,13 @@ OBJ = ivyloop.o timer.o ivysocket.o ivy.o
 GOBJ = ivyloop.o timer.o ivysocket.o givy.o
 XTOBJ = ivyxtloop.o ivysocket.o ivy.o
 
+ifneq (strip $(MAJOR),)
+MAJOR=1
+endif
+ifneq(strip $(MINOR),)
+MINOR=2
+endif
+
 .c.o:
 	$(CC) -fPIC $(CFLAGS) -c $*.c
 
@@ -24,7 +31,7 @@ all: static-libs commands shared-libs
 
 static-libs: libivy.a libgivy.a libxtivy.a
 
-shared-libs: libivy.so.$(VERSION).$(MAJOR_MINOR) libgivy.so.$(VERSION).$(MAJOR_MINOR) libxtivy.so.$(VERSION).$(MAJOR_MINOR)
+shared-libs: libivy.so.$(MAJOR).$(MINOR) libgivy.so.$(MAJOR).$(MINOR) libxtivy.so.$(MAJOR).$(MINOR)
 
 commands: testivy testxtivy
 
@@ -52,14 +59,14 @@ libxtivy.a: $(XTOBJ)
 	rm -f $@
 	ar cq $@ $(XTOBJ)
 
-libivy.so.$(VERSION).$(MAJOR_MINOR): $(OBJ)
-	$(CC) -shared -Wl,-soname,libivy.so.$(VERSION) -o $@ $(OBJ) -lc
+libivy.so.$(MAJOR).$(MINOR): $(OBJ)
+	$(CC) -shared -Wl,-soname,libivy.so.$(MAJOR) -o $@ $(OBJ) -lc
 
-libgivy.so.$(VERSION).$(MAJOR_MINOR): $(GOBJ)
-	$(CC) -shared -Wl,-soname,libgivy.so.$(VERSION) -o $@ $(GOBJ) -lc
+libgivy.so.$(MAJOR).$(MINOR): $(GOBJ)
+	$(CC) -shared -Wl,-soname,libgivy.so.$(MAJOR) -o $@ $(GOBJ) -lc
 
-libxtivy.so.$(VERSION).$(MAJOR_MINOR): $(XTOBJ)
-	$(CC) -shared -Wl,-soname,libxtivy.so.$(VERSION) -o $@ \
+libxtivy.so.$(MAJOR).$(MINOR): $(XTOBJ)
+	$(CC) -shared -Wl,-soname,libxtivy.so.$(MAJOR) -o $@ \
 	$(XTOBJ) -L$(XTLIB) -lXt -lX11 -lc
 
 clean:
@@ -73,11 +80,11 @@ install: all
 	install -m644 libgivy.a $(DESTDIR)/usr/lib
 	install -m644 libxtivy.a $(DESTDIR)/usr/X11R6/lib
 
-	install -m644 libivy.so.$(VERSION).$(MAJOR_MINOR) $(DESTDIR)/usr/lib
-	install -m644 libgivy.so.$(VERSION).$(MAJOR_MINOR) $(DESTDIR)/usr/lib
-	install -m644 libxtivy.so.$(VERSION).$(MAJOR_MINOR) $(DESTDIR)/usr/X11R6/lib
-	cd $(DESTDIR)/usr/lib && ln -s libivy.so.$(VERSION).$(MAJOR_MINOR) libivy.so
-	cd $(DESTDIR)/usr/lib && ln -s libgivy.so.$(VERSION).$(MAJOR_MINOR) libgivy.so
-	cd $(DESTDIR)/usr/X11R6/lib && ln -s libxtivy.so.$(VERSION).$(MAJOR_MINOR) libxtivy.so
+	install -m644 libivy.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
+	install -m644 libgivy.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib
+	install -m644 libxtivy.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/X11R6/lib
+	cd $(DESTDIR)/usr/lib && ln -s libivy.so.$(MAJOR).$(MINOR) libivy.so
+	cd $(DESTDIR)/usr/lib && ln -s libgivy.so.$(MAJOR).$(MINOR) libgivy.so
+	cd $(DESTDIR)/usr/X11R6/lib && ln -s libxtivy.so.$(MAJOR).$(MINOR) libxtivy.so
 
 	install -m644 *.h $(DESTDIR)/usr/include
-- 
cgit v1.1