[emos] 15/37: WIP: Fix install and links

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository emos.

commit 6988c959f6e94d3434ab1e65509dfaac0d0c7bcd
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon May 25 13:02:34 2015 +0100

    WIP: Fix install and links
---
 ...{libemos-dev.install => libemos-dev.install.in} |  2 +-
 debian/libemos-dev.links.in                        |  6 ++++
 debian/libemos0d.install                           |  1 -
 debian/libemos0d.install.in                        |  2 ++
 debian/rules                                       | 39 +++++-----------------
 5 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/debian/libemos-dev.install b/debian/libemos-dev.install.in
similarity index 80%
rename from debian/libemos-dev.install
rename to debian/libemos-dev.install.in
index 0ba1f44..045e8f7 100644
--- a/debian/libemos-dev.install
+++ b/debian/libemos-dev.install.in
@@ -1,5 +1,5 @@
 pbio/*.h		usr/include/pbio
 gribex/*.h		usr/include/gribex
 interpolation/*.h	usr/include/interpolation
-obj-*/lib/*.a		usr/lib/ARCH
+obj-*/lib/*.a		usr/lib/@ARCH@
 # usr/lib/*/pkgconfig
diff --git a/debian/libemos-dev.links.in b/debian/libemos-dev.links.in
new file mode 100644
index 0000000..fa7c9f2
--- /dev/null
+++ b/debian/libemos-dev.links.in
@@ -0,0 +1,6 @@
+/usr/lib/@ARCH@/libemos.so.0d /usr/lib/@ARCH@/libemos.so
+/usr/lib/@ARCH@/libemosR64.so.0d /usr/lib/@ARCH@/libemosR64.so
+/usr/lib/@ARCH@/libemos.so.0d /usr/lib/@ARCH@/libemos.R32.D64.I32.so
+/usr/lib/@ARCH@/libemosR64.so.0d /usr/lib/@ARCH@/libemos.R64.D64.I32.so
+/usr/lib/@ARCH@/libemos.a /usr/lib/@ARCH@/libemos.R32.D64.I32.a
+/usr/lib/@ARCH@/libemosR64.a /usr/lib/@ARCH@/libemos.R64.D64.I32.a
diff --git a/debian/libemos0d.install b/debian/libemos0d.install
deleted file mode 100644
index 2c229ea..0000000
--- a/debian/libemos0d.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/*.0d
diff --git a/debian/libemos0d.install.in b/debian/libemos0d.install.in
new file mode 100644
index 0000000..e00bbff
--- /dev/null
+++ b/debian/libemos0d.install.in
@@ -0,0 +1,2 @@
+obj-*/lib/libemos.so	/usr/lib/@ARCH@/libemos.so.0d
+obj-*/lib/libemosR64.so	/usr/lib/@ARCH@/libemosR64.so.0d
diff --git a/debian/rules b/debian/rules
index c55cf45..029ecb1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,14 +6,16 @@ export DH_VERBOSE=1
 %:
 	dh $@ --buildsystem=cmake
 
-DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
-SUBDIRS=" gribex interpolation bufrdc crexdc pbio fft bufrtables grib_api_merging" 
+AUTOGENERATED:= libemos-dev.install libemos0d.install libemos-dev.links
 
 override_dh_auto_clean:
 	find bufrtables -type l -delete
+	rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
+	dh_auto_clean
 
+override_dh_auto_test:
+	@echo TESTS TEMPORARILY DISABLED.
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -21,31 +23,8 @@ override_dh_auto_configure:
 		-DBUILD_SHARED_LIBS=ON \
 		-DBUFR_TABLES_PATH=/usr/share/emos/bufrtables
 
-# override_dh_auto_build:
-	# ( cd gribex && ln -sf ../config.h config.h )
-	# First build libemos.a
-	# $(MAKE) SUBDIRS=$(SUBDIRS) ARCH=linux CNAME=_gfortran A64= R64= GRIB_API_MERGING=grib_api_merging clean all
-	# Then rebuild pic for objects ...
-	# $(MAKE) SUBDIRS=$(SUBDIRS) ARCH=linux CNAME=_gfortran+pic A64= R64= GRIB_API_MERGING=grib_api_merging clean all
-	# Link them into libemos.so
-	# $(MAKE) -f debian/build-shlib R64= DESTDIR=$(DESTDIR) LIBDIR=$(LIBDIR)
-	# And repeat for 64-bit reals.
-	# $(MAKE) SUBDIRS=$(SUBDIRS) ARCH=linux CNAME=_gfortran R64=R64 A64= GRIB_API_MERGING=grib_api_merging clean all 
-	# $(MAKE) SUBDIRS=$(SUBDIRS) ARCH=linux CNAME=_gfortran+pic  R64=R64 A64= GRIB_API_MERGING=grib_api_merging clean all 
-	# $(MAKE) -f debian/build-shlib R64=R64 DESTDIR=$(DESTDIR) LIBDIR=$(LIBDIR)
-
 override_dh_auto_install:
-	chmod a-x examples/*/*
-	mkdir -p $(DESTDIR)/$(LIBDIR)
-	mv libemos* debian/libemos*.0d  $(DESTDIR)/$(LIBDIR)
-	echo "" > .r64
-	echo "$(DESTDIR)/usr/share/emos" > .emos
-	ls bufrtables/*000* > .list/bufrtables
-	mkdir -p $(DESTDIR)/usr/share/emos
-	./install
-	find $(DESTDIR)/usr/share -type f -exec chmod 644 {} \;
-	$(MAKE) -C pkgconfig install prefix=$(DESTDIR)/usr
-	find debian -name config.h -delete
-	# multi-arch
-	dh_link -p  libemos-dev $(LIBDIR)/libemos.so.0d $(LIBDIR)/libemos.so
-	dh_link -p  libemos-dev $(LIBDIR)/libemosR64.so.0d $(LIBDIR)/libemosR64.so
+	for f in ${AUTOGENERATED} ; \
+		sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%' < debian/$$f.in  > debian/$$f ; \
+		done
+	dh_auto_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git