[Pkg-octave-commit] [SCM] octave-symbolic branch, master, updated. a718b53403d9f164f8c2a3df521385a01d28a11b

[pkienzle]

The following commit has been merged in the master branch:
commit b8d722c81bd14c696b0a3553c31bed47301f270c
Author: pkienzle <pkienzle at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date:   Mon Mar 18 07:43:33 2002 +0000

    Makefiles more consistent; accept optional "install" target in tertiary makes
    
    
    git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@206 416fae20-06d0-4450-9b69-c6c34d4b5f03

diff --git a/Makeconf.add b/Makeconf.add
index c76527e..cca8265 100644
--- a/Makeconf.add
+++ b/Makeconf.add
@@ -1 +1,4 @@
+# Define HAVE_GINAC=1 if GINAC is available.  Other packages might 
+# need to define search paths for headers and libraries here, but GiNaC
+# defines the script ginac-config to report these.
 @DEFHAVE_GINAC@
diff --git a/Makefile b/Makefile
index a38821f..47c2d72 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 
 sinclude ../../Makeconf
 
-ifndef MKOCTFILE
-	# assumptions to make if not using ./configure script
+# assumptions to make if not using ./configure script
+ifndef OCTAVE_FORGE
 	MKOCTFILE=mkoctfile
 	HAVE_GINAC=1
 endif
@@ -30,14 +30,13 @@ endif
 
 all: $(PROGS)
 
-symbols.oct: Makefile $(OBJ)
-	$(MKOCTFILE) -v -o $@ $(OBJ) $(GINAC_LD_FLAGS) ; \
+$(PROGS): Makefile
 
-$(SYMBOLS_LINKS): Makefile
+symbols.oct: $(OBJ)
+	$(MKOCTFILE) -v -o $@ $(OBJ) $(GINAC_LD_FLAGS)
+
+$(SYMBOLS_LINKS):
 	-$(RM) $@
 	$(LN_S) symbols.oct $@
 
-clean:
-	$(RM) *.o *.oct core octave-core *~
-
-
+clean: ; $(RM) *.o core octave-core *.oct *~
diff --git a/configure.add b/configure.add
index 8ad9d4a..b25cde6 100644
--- a/configure.add
+++ b/configure.add
@@ -1,22 +1,40 @@
 
 if test -e main/symbolic/NOINSTALL ; then
-	dnl Not installing so don't test for it.
-	DEFHAVE_GINAC=
+
+	dnl Not installing so don't test for GiNaC.
 	STATUS=noinstall
+
 else
-	AC_SUBST(DEFHAVE_GINAC)
 
+	dnl Checking if the ginac-config program exists.  See the autoconf
+	dnl manual for an extensive list of checks available.  The results
+	dnl of the check are held in have_ginac.
 	AC_DEFINE(have_ginac)
 	AC_CHECK_PROG(have_ginac, ginac-config, yes, no)
 
 	if test $have_ginac = no ; then
-	    DEFHAVE_GINAC=
+
+	    dnl ginac-config doesn't exist: instruct the user how to install
 	    STATUS="GiNaC not found --- see main/symbolic/INSTALL"
+
 	else
-	    DEFHAVE_GINAC="HAVE_GINAC=1"
+
+	    dnl ginac-config exists: cheer
 	    STATUS=yes
+
+	    dnl Let Makeconf.add know that ginac-config exists.	We don't
+	    dnl need to report the library location since ginac-config
+	    dnl does that.  AC_SUBST says replace @VAR@ in the substituted
+	    dnl file with the value of VAR.
+	    AC_SUBST(DEFHAVE_GINAC)
+	    DEFHAVE_GINAC="HAVE_GINAC=1"
+
 	fi
 fi
 
+dnl Append the status message to the global status message.  This will
+dnl be displayed at the end of configuration so that the user doesn't
+dnl have to scan the list for critical details.
+
 STATUS_MSG="$STATUS_MSG
    symbolic toolbox: $STATUS"

-- 
octave-symbolic