[SCM] Debian packaging for the lrslib vertex enumeration package branch, master, updated. f896e37fc37f0bf4fd04654a35e75049a103360d

[David Bremner]

The following commit has been merged in the master branch:
commit 332f43702a15144668a7dd6ba4ad2f9bb21c55db
Author: David Bremner <bremner at unb.ca>
Date:   Sat Oct 17 14:15:22 2009 -0300

    Rework install process to first install to debian/tmp as per convention.
    This removes the need for extra steps to make the .so symlink in the -dev package.

diff --git a/debian/Makefile.debian b/debian/Makefile.debian
index aef2300..0795f11 100644
--- a/debian/Makefile.debian
+++ b/debian/Makefile.debian
@@ -26,10 +26,19 @@ BINARIES=lrs redund nash fourier setupnash setupnash2 lrsbuffer 2nash
 %: %.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< $(LDFLAGS) 
 
+install: all
+	 mkdir -p $(DESTDIR)/usr/lib
+	 install -t $(DESTDIR)/usr/lib $(SHLIB) $(LIB)
+	 cd $(DESTDIR)/usr/lib && ln -sf $(SHLIB) $(SHLINK)
+	 mkdir -p $(DESTDIR)/usr/bin
+	 install -t $(DESTDIR)/usr/bin $(BINARIES)
+	 mkdir -p $(DESTDIR)/usr/include
+	 install -t $(DESTDIR)/usr/include lrslib.h lrsgmp.h
+
 all: $(SHLINK) $(LIB) $(BINARIES) 
 
 $(SHLINK): $(SHLIB)
-	   ln -sf $(SHLIB) $(SHLINK)
+
 
 $(SHLIB): $(SHLIBOBJ)
 	$(CC) -shared -Wl,-soname=$(SONAME) $(SHLIBFLAGS) -o $@ $(SHLIBOBJ)
diff --git a/debian/liblrs-dev.install b/debian/liblrs-dev.install
index 0b35a0b..ded0be1 100644
--- a/debian/liblrs-dev.install
+++ b/debian/liblrs-dev.install
@@ -1,3 +1,4 @@
-liblrs.a usr/lib
-lrslib.h usr/include
-lrsgmp.h usr/include
+usr/lib/liblrs.a usr/lib
+usr/lib/liblrs.so usr/lib
+usr/include/lrslib.h usr/include
+usr/include/lrsgmp.h usr/include
diff --git a/debian/rules b/debian/rules
index 4ca0ddc..cfa52de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,16 @@ DB2MAN=/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl
 XP=xsltproc --nonet
 
 override_dh_auto_build: lrslib.1 nash.1
-	make -f debian/Makefile.debian SONAME=$(SONAME) SOMINOR=$(SOMINOR) SHLIB=$(SONAME)$(SOMINOR)
+	make -f debian/Makefile.debian SONAME=$(SONAME) SOMINOR=$(SOMINOR) SHLIB=$(SONAME)$(SOMINOR) \
+			DESTDIR=$(CURDIR)/debian/tmp  all
+
+override_dh_auto_install: lrslib.1 nash.1
+	make -f debian/Makefile.debian SONAME=$(SONAME) SOMINOR=$(SOMINOR) SHLIB=$(SONAME)$(SOMINOR) \
+			DESTDIR=$(CURDIR)/debian/tmp  install
 
 override_dh_auto_clean:
 	make -f debian/Makefile.debian SONAME=$(SONAME) SOMINOR=$(SOMINOR) SHLIB=$(SONAME)$(SOMINOR) clean
 
-override_dh_auto_install: 
-	#this is a bit crude, but dh_install and dh_link are both being too clever.
-	mkdir -p debian/liblrs-dev/usr/lib && ln -sf $(SONAME) debian/liblrs-dev/usr/lib/liblrs.so
-
 %: 
 	dh $@
 

-- 
Debian packaging for the lrslib vertex enumeration package