[SCM] an open source computer algebra system branch, debian, updated. 135ce5a283b0c913d2722c86fa55fffa2e22f4db

Bernhard R. Link brlink at debian.org
Sun Feb 19 20:34:13 UTC 2012


The following commit has been merged in the debian branch:
commit f1280e20976aff7fcbad05114fe480f493d705f2
Author: Felix Salfelder <felix at salfelder.org>
Date:   Thu Feb 16 11:07:25 2012 +0100

    This patch fixes the bogus default targets in Makefile.in
    now 'make\ {all,install}' works as usual and expected

diff --git a/Makefile.in b/Makefile.in
index 8e78512..1e1f4f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,8 +24,12 @@ GUNZIP		= @GUNZIP@
 
 ##############################################################
 # default target
-${SINGULAR}:
-	${MAKE} install
+all:
+	@ for SUBDIR in ${BUILD1_SUBDIRS}; \
+	do \
+	  echo ${MAKE} all in $${SUBDIR}; \
+	  ${MAKE} -C $$SUBDIR || exit 1; \
+	done
 
 ##############################################################
 # general targets
@@ -34,7 +38,7 @@ ${SINGULAR}:
 
 TEXINFO_TEX_FILES = epsf.tex texinfo.tex txi-cs.tex txi-de.tex txi-no.tex
 TEXINFO_TEX_DIR = Texinfo/doc
-all:
+bogus_all:
 	echo For everybody who did not read the README: use make install
 	exit 1
 
@@ -42,7 +46,7 @@ install install_all:
 	@ for SUBDIR in ${BUILD1_SUBDIRS}; \
 	do \
 	  echo ${MAKE} $@ in $${SUBDIR}; \
-	  (cd $${SUBDIR} && ${MAKE} $@ ) || exit 1;\
+	  ${MAKE} -C $$SUBDIR $@ ;\
 	  (if test "$${SUBDIR}" = Texinfo && test -d doc; then \
 		for FILE in ${TEXINFO_TEX_FILES}; \
 		do \
@@ -62,7 +66,7 @@ install-nolns:
 	@ for SUBDIR in ${BUILD1_SUBDIRS}; \
 	do \
 	  echo ${MAKE} $@ in $${SUBDIR}; \
-	  (cd $${SUBDIR} && ${MAKE} $@ )  || exit 1;\
+	  ${MAKE} -C $$SUBDIR $@ ;\
 	  (if test "$${SUBDIR}" = Texinfo && test -d doc; then \
 	    for FILE in ${TEXINFO_TEX_FILES}; \
 	    do \

-- 
an open source computer algebra system



More information about the debian-science-commits mailing list