[Pkg-scicomp-commits] atlas/trunk/debian

[Sylvestre Ledru]

SVN commit 4495 by sylvestre-guest:

Work on the target done

 M  +14 -10    atlas/trunk/debian/rules  


--- atlas/trunk/debian/rules #4494:4495
@@ -85,7 +85,6 @@
 # DEB_DH_MAKESHLIBS_ARGS_v-sim-plugins := -n
 
 custom: custom-stamp
-		rm custom-stamp
 
 # Build a custom package optimized for the current arch
 custom-stamp:
@@ -100,7 +99,7 @@
 		#   therefor, leaving the choice of the optimization to Atlas
 		# * After that, we fall back to the normal build procedure by calling
 		#   debian/rules itself (yep, recursively)
-		debian/rules ARCHS=base__ build
+		debian/rules ARCHS=base__ binary
 		touch $@
 
 configure-stamp:
@@ -143,11 +142,15 @@
 		done
 		touch $@
 
-install/libatlas3gf-base::
+binary-install/libatlas3gf-base::
 	mv $(CURDIR)/debian/tmp/usr/lib/atlas-base/  $(CURDIR)/debian/tmp/usr/lib/atlas/
 	mv $(CURDIR)/debian/tmp/usr/lib/atlas/libatlas* $(CURDIR)/debian/tmp/usr/lib/
 	mv $(CURDIR)/debian/tmp/usr/lib/atlas/libf77blas* $(CURDIR)/debian/tmp/usr/lib/ 
 	mv $(CURDIR)/debian/tmp/usr/lib/atlas/libcblas* $(CURDIR)/debian/tmp/usr/lib/ 
+	# Then, we move the files in the right directory
+	mkdir -p $(CURDIR)/debian/libatlas3gf-base/usr/lib/atlas/
+	mv $(CURDIR)/debian/tmp/usr/lib/atlas/*.so* $(CURDIR)/debian/libatlas3gf-base/usr/lib/atlas/
+	mv $(CURDIR)/debian/tmp/usr/lib/*.so* $(CURDIR)/debian/libatlas3gf-base/usr/lib/
 
 
 check: build
@@ -169,8 +172,8 @@
 
 install: install-arch install-indep
 
-install-indep: install-indep-stamp
-install-indep-stamp: build-indep-stamp
+install-indep: configure build install-indep-stamp
+install-indep-stamp:
 		dh_testdir
 		dh_testroot
 		dh_clean -k -i 
@@ -184,8 +187,8 @@
 #		dh_install -i --sourcedir=$(CURDIR)/debian/atlas
 		touch $@
 
-install-arch: install-arch-stamp
-install-arch-stamp: build-arch-stamp
+install-arch: configure build  install-arch-stamp
+install-arch-stamp:
 		dh_testdir
 		dh_testroot
 #		dh_clean -k -s 
@@ -201,7 +204,7 @@
 
 binary: binary-indep binary-arch
 
-binary-indep: install-indep-stamp
+binary-indep: build install
 		dh_testdir -i
 		dh_testroot -i
 		dh_installchangelogs  -i
@@ -220,7 +223,7 @@
 		dh_md5sums -i
 		dh_builddeb -i
 
-binary-arch: install-arch-stamp
+binary-arch: build install
 		dh_testdir -a
 		dh_testroot -a
 		dh_installchangelogs  -a
@@ -241,7 +244,8 @@
 #		dh_md5sums -a
 #		dh_builddeb -a
 
-.PHONY: binary binary-arch binary-indep build-arch build-indep clean install-indep install-arch
+.PHONY: build build-indep build-indep-stamp build-arch build-arch-stamp check clean binary binary-indep binary-arch configure-stamp configure custom custom-stamp
 
+
 get-orig-source:
 	-uscan --upstream-version 0