From f0798710d69669d861b86a7b0ff2521db42e57cf Mon Sep 17 00:00:00 2001 From: LOFAR <sdos@astron.nl> Date: Mon, 11 Apr 2005 14:30:48 +0000 Subject: [PATCH] %[ER: 71]% changed install path to reflect thge variants --- Makefile | 8 ++------ autoconf_share/lofarconf_recur | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index dbffa21a059..ac6bb5ce42c 100644 --- a/Makefile +++ b/Makefile @@ -98,9 +98,7 @@ build_system: && echo ":::::: DONE BOOTSTRAPPING $$pkg" \ && echo ); \ for var in $(VARIANTS); do \ - case $$var in gnu3*) inst_var=gcc3;; \ - gnu*) inst_var=gcc2;; \ - icc*) inst_var=icc;; \ + case $$var in *) inst_var=$$var;; \ esac; \ (echo \ && echo ":::::: CONFIGURING VARIANT $$var FOR PACKAGE $$pkg" \ @@ -206,9 +204,7 @@ configure: $(VARIANTNAMES:.variant=.variant_configure) # %.variant_configure: variant=`basename $@ .variant_configure`; \ - case $$variant in gnu3*) inst_var=gcc3;; \ - gnu*) inst_var=gcc2;; \ - icc*) inst_var=icc;; \ + case $$variant in *) inst_var=$$var;; \ esac; \ (echo \ && echo ":::::: CONFIGURING VARIANT $$variant FOR PACKAGE $$pkg" \ diff --git a/autoconf_share/lofarconf_recur b/autoconf_share/lofarconf_recur index 62a97f436cf..a1532c6f3cc 100755 --- a/autoconf_share/lofarconf_recur +++ b/autoconf_share/lofarconf_recur @@ -151,9 +151,7 @@ build_system: for pkg in $(RECUR_PACKAGES); do \ if test -d $$pkg ; then \ for var in $(RECUR_VARIANTS); do \ - case $$var in gnu3*) inst_var=gcc3;; \ - gnu*) inst_var=gcc2;; \ - icc*) inst_var=icc;; \ + case $$var in *) inst_var=$$var;; \ esac; \ (echo \ && echo ":::::: CONFIGURING VARIANT $$var FOR PACKAGE $(LOFARPACKAGE)/$$pkg" \ -- GitLab