[Pkg-octave-commit] rev 489 - branches/2.9transition/packages/octave-forge/debian

[Colin ingram]

Author: cjingram-guest
Date: 2006-02-08 00:34:57 +0000 (Wed, 08 Feb 2006)
New Revision: 489

Modified:
   branches/2.9transition/packages/octave-forge/debian/rules
Log:
debian/rules (configure rule)
** fixed l_configure

debian/rules (install rule)
** added l_install with install-stamp2.1 and install-stamp2.9 for two package build

debian/rules (clean rule)
** remove NOINSTALL's that are created in configure


Modified: branches/2.9transition/packages/octave-forge/debian/rules
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/rules	2006-02-07 20:42:15 UTC (rev 488)
+++ branches/2.9transition/packages/octave-forge/debian/rules	2006-02-08 00:34:57 UTC (rev 489)
@@ -39,6 +39,9 @@
 linkerflags	= "-s"
 
 define l_configure
+	patch-stamp
+	chmod 0755 admin/octlink.sh
+	dh_testdir 
 	touch extra/MacOSX/NOINSTALL
 	[ -f autogen.sh ] && ./autogen.sh && chmod 0755 configure
 	CC=$(compilerpath)			\
@@ -53,6 +56,22 @@
 	touch configure-stamp__OCTVERS__
 endef
 
+define l_install
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	strip */*/*.oct
+	$(MAKE) install MPATH=$(debtmp)/$(mdir)/$(PACKAGE)	\
+			OPATH=$(debtmp)/$(__VERS__octdir)/$(PACKAGE) \
+			XPATH=$(debtmp)/$(octbin)		\
+			ALTMPATH=$(debtmp)/$(altmdir)           \
+			ALTOPATH=$(debtmp)/$(altoctdir)         \
+			prefix=$(debtmp)/usr			\
+			mandir=$(debtmp)/usr/share/man
+	rm -vf $(debtmp)/rasmol.sh
+	touch install-stamp__VERS__
+
 get-orig-source: upstream
 upstream:
 		links http://octave.sf.net
@@ -62,19 +81,15 @@
 
 configure:	configure-stamp
 
-configure-stamp2.1: patch-stamp
-		    dh_testdir
-		    $(subst __OCTVERS__,$(2.1),$(l_configure))
+configure-stamp2.1: $(subst __OCTVERS__,$(2.1),$(l_configure))
 
-configure-stamp2.9: patch-stamp
-		    dh_testdir
-	            touch main/sparse/NOINSTALL
+configure-stamp2.9: touch main/sparse/NOINSTALL
 		    $(subst __OCTVERS__,$(2.9),$(l_configure))
 
 configure-stamp: patch-stamp
 		 chmod 0755 admin/octlink.sh
 		 dh_testdir
-		mv configure configure-orig
+		 mv configure configure-orig
 		touch extra/MacOSX/NOINSTALL
 		touch main/sparse/NOINSTALL
 		[ -f autogen.sh ] && ./autogen.sh && chmod 0755 configure
@@ -115,6 +130,9 @@
 		rm -vf $(debtmp)/rasmol.sh
 		touch install-stamp
 
+install-stamp2.1: $(subst __VERS__,2.1,$(l_install))
+install-stamp2.9: $(subst __VERS__,2.9,$(l_install))
+
 check:		check-stamp
 check-stamp:
 		dh_testdir
@@ -131,7 +149,7 @@
 		-rm -rf *~ $(debtmp) debian/*~ debian/files*	\
 			fntests.* admin/RPM/octave-forge.spec
 		-rm -f `find . -name PKG_ADD`
-
+		rm -f extra/MacOSX/NOINSTALL main/sparse/NOINSTALL 
 		# The following should be dropped when the 
 		# main/set/Makefile is included in the upstream tarball
 		-rm -f main/set/ismember.m main/set/setdiff.m	\