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

[Colin ingram]

Author: cjingram-guest
Date: 2006-02-07 20:42:15 +0000 (Tue, 07 Feb 2006)
New Revision: 488

Modified:
   branches/2.9transition/packages/octave-forge/debian/rules
Log:
debian/rules
** added new configure rules and variables to be used in dual package build


Modified: branches/2.9transition/packages/octave-forge/debian/rules
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/rules	2006-02-07 19:59:47 UTC (rev 487)
+++ branches/2.9transition/packages/octave-forge/debian/rules	2006-02-07 20:42:15 UTC (rev 488)
@@ -4,13 +4,20 @@
 # Copyright 2000 - 2004 by Dirk Eddelbuettel <edd at debian.org>
 
 PACKAGE		= octave-forge
+common_pkg      = $(PACKAGE)-common
+2.1_pkg         = $(PACKAGE)2.1
+2.9_pkg         = $(PACKAGE)2.9
 
 include /usr/share/dpatch/dpatch.make
 include /usr/share/octave/debian/defs.make
 
+2.1             = 2.1.72
+2.9             = 2.9.4
 altname         = octave-forge-alternatives
 debtmp		:= $(CURDIR)/debian/$(PACKAGE)
 debdoc          := $(debtmp)/usr/share/doc/$(PACKAGE)
+2.9octdir  	:= $(shell octave-config-$(2.9) -p LOCALAPIOCTFILEDIR)
+2.1octdir  	:= $(shell octave-config-$(2.1) -p LOCALAPIOCTFILEDIR)
 octdir  	:= $(OCTDIR)
 mdir	  	:= $(MDIR)
 altoctdir       := /usr/lib/$(altname)
@@ -25,25 +32,26 @@
 		@echo "octbin $(octbin)"
 
 arch 		:= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-
-## edd 22 Feb 2003 now use 3.2 versions everywhere
-## edd 27 Jun 2003  now that gcc 3.3 is in unstable and testing, relax this
-#compilerpath	= /usr/bin/gcc-3.2
-#cpppath		= /usr/bin/g++-3.2
-#fcpath		= /usr/bin/g77-3.2
 compilerpath	= /usr/bin/gcc
 cpppath		= /usr/bin/g++
 fcpath		= /usr/bin/gfortran
 compilerflags	= "-O2"
 linkerflags	= "-s"
 
-## hppa needs g++-3.3
-## edd 27 Jun 2003  now that gcc 3.3 is in unstable and testing, relax this
-#ifeq ($(arch),hppa-linux)
-#compilerpath	= /usr/bin/gcc-3.3
-#cpppath		= /usr/bin/g++-3.3
-#fcpath		= /usr/bin/g77-3.3
-#endif
+define l_configure
+	touch extra/MacOSX/NOINSTALL
+	[ -f autogen.sh ] && ./autogen.sh && chmod 0755 configure
+	CC=$(compilerpath)			\
+	CXX=$(cpppath) 				\
+	FC=$(fcpath)				\
+	F77=$(fcpath)				\
+	CFLAGS=$(compilerflags)			\
+	CXXFLAGS=$(compilerflags)		\
+	FFLAGS=$(compilerflags)			\
+	OCTAVE=octave-__OCTVERS__	       	\
+	MKOCTFILE=mkoctfile-__OCTVERS__	        \
+	touch configure-stamp__OCTVERS__
+endef
 
 get-orig-source: upstream
 upstream:
@@ -53,6 +61,16 @@
                 # see the script cvs_checkout.sh instead
 
 configure:	configure-stamp
+
+configure-stamp2.1: patch-stamp
+		    dh_testdir
+		    $(subst __OCTVERS__,$(2.1),$(l_configure))
+
+configure-stamp2.9: patch-stamp
+		    dh_testdir
+	            touch main/sparse/NOINSTALL
+		    $(subst __OCTVERS__,$(2.9),$(l_configure))
+
 configure-stamp: patch-stamp
 		 chmod 0755 admin/octlink.sh
 		 dh_testdir
@@ -103,7 +121,7 @@
 		-$(MAKE) check 	OCTAVE=octave-2.9.4
 		touch check-stamp
 
-clean: unpatch
+clean: 		unpatch
 		dh_testdir
 		dh_testroot
 		-test -f configure-orig && mv configure-orig configure