diff -uNr ATLAS/CONFIG/src/SpewMakeInc.c ATLAS.fink/CONFIG/src/SpewMakeInc.c --- ATLAS/CONFIG/src/SpewMakeInc.c 2014-07-10 12:22:02.000000000 -0400 +++ ATLAS.fink/CONFIG/src/SpewMakeInc.c 2016-03-10 10:43:44.000000000 -0500 @@ -788,7 +788,7 @@ if (USEMINGW) fprintf(fpout, "\n ARCHIVER = $(BLDdir)/mgwar\n"); else - fprintf(fpout, "\n ARCHIVER = ar\n"); + fprintf(fpout, "\n ARCHIVER = XXXXX\n"); fprintf(fpout, " ARFLAGS = r\n"); /* * JF Mertens says that even x86 OS X still need ranlib for safety diff -uNr ATLAS/CONFIG/src/atlconf_misc.c ATLAS.fink/CONFIG/src/atlconf_misc.c --- ATLAS/CONFIG/src/atlconf_misc.c 2014-07-10 12:22:02.000000000 -0400 +++ ATLAS.fink/CONFIG/src/atlconf_misc.c 2016-03-10 10:47:25.000000000 -0500 @@ -775,7 +775,8 @@ char *path, *pp, *p; int i, n; - path = getenv("PATH"); + /* path = getenv("PATH"); */ + path = "@COMPILER_PATH@"; if (!path) return(NULL); diff -uNr ATLAS/CONFIG/src/config.c ATLAS.fink/CONFIG/src/config.c --- ATLAS/CONFIG/src/config.c 2014-07-10 12:22:02.000000000 -0400 +++ ATLAS.fink/CONFIG/src/config.c 2016-03-10 10:43:44.000000000 -0500 @@ -429,7 +429,7 @@ if (OS == OSOSX) /* /sw is for fink, /opt for macports */ { sp = FindF77LIB0(verb, targarg, OS, arch, comps, f77lib, f77libnam, - "/sw/lib /opt/lib /opt/local/lib"); + "@F77LIB_PATH@"); if (sp) return(sp); } diff -uNr ATLAS/CONFIG/src/probe_comp.c ATLAS.fink/CONFIG/src/probe_comp.c --- ATLAS/CONFIG/src/probe_comp.c 2014-07-10 12:22:02.000000000 -0400 +++ ATLAS.fink/CONFIG/src/probe_comp.c 2016-03-10 11:01:10.000000000 -0500 @@ -1261,7 +1261,7 @@ */ if (OS == OSOSX) /* /sw is for fink, /opt is for macports */ { - OSpaths = "/sw/bin /opt/local/bin /opt/local/sbin"; + OSpaths = "@COMPILER_PATH@"; } /* * We first look in any high-priority OS-specific spots for the right files @@ -1322,7 +1322,7 @@ * Try searching in $HOME/local, including all subdirs */ ln = CheckStrLen(ln, &lnlen, 64); - sprintf(ln, "find $HOME/local -name '*gcc*' -exec ./xisgcc '{}' \\;"); + sprintf(ln, "find @COMPILER_PATH@ -name '*gcc*' -exec ./xisgcc '{}' \\;"); fp = atlsys(NULL, ln, verb, 1); if (fp) { @@ -1346,7 +1346,7 @@ */ { char *stdpaths = - "/usr/local /bin /sbin /usr/bin /usr/sbin /opt/bin /opt/sbin"; + "@COMPILER_PATH@"; i = 64 + strlen(stdpaths); ln = CheckStrLen(ln, &lnlen, i); @@ -1417,7 +1417,7 @@ */ if (OS == OSOSX) /* /sw is for fink, /opt is for macports */ { - OSpaths = "/sw/bin /opt/local/bin /opt/local/sbin"; + OSpaths = "@COMPILER_PATH@"; } /* * We first look in any high-priority OS-specific spots for the right files diff -uNr ATLAS/ar2 ATLAS.fink/ar2 --- ATLAS/ar2 1969-12-31 19:00:00.000000000 -0500 +++ ATLAS.fink/ar2 2016-03-10 10:43:44.000000000 -0500 @@ -0,0 +1,25 @@ +#!/bin/sh +#Simulates ar r with libtool + +#If another option is given, just call ar and bail out +if [ $1 != 'r' ]; then + ar $@ + exit $? +fi + +#Skips the first two arguments (r libname) +libname=$2 +shift +shift + +#All objects name are collected in $obj +if [ -e $libname ]; then + ar d $libname $@ + mv $libname $libname.tmp + libtool -static -o $libname $libname.tmp $@ + rm $libname.tmp + ranlib $libname +else + libtool -static -o $libname $@ +fi +