Changeset e38d58c for scripts/untested

Timestamp:

Feb 21, 2006, 12:24:18 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

8a3554d

Parents:

17c4d95

Message:

r610@server (orig r608): ryan | 2005-08-05 23:36:05 -0700
Ensure extraconf is set correctly for each build

File:

• scripts/untested/blfs-scripts/blfs-fftw3.sh (modified) (4 diffs)

scripts/untested/blfs-scripts/blfs-fftw3.sh

@@ -9 +9 @@
 set_libdirname
 setup_multiarch
-if [ ! "${libdirname}" = "lib" ]; then
-   extra_conf="--libdir=/usr/${libdirname}"
-fi
 
 unpack_tarball fftw-${FFTW3_VER}
 if [ -d ${PKGDIR}-single ]; then rm -rf ${PKGDIR}-single ; fi
 mv ${PKGDIR} ${PKGDIR}-single
+
 unpack_tarball fftw-${FFTW3_VER}
 if [ -d ${PKGDIR}-double ]; then rm -rf ${PKGDIR}-double ; fi
 mv ${PKGDIR} ${PKGDIR}-double
+
 unpack_tarball fftw-${FFTW3_VER}
 if [ -d ${PKGDIR}-long-double ]; then rm -rf ${PKGDIR}-long-double ; fi
@@ -26 +25 @@
 ### SINGLE ###
 cd ${SRC}/${PKGDIR}-single
+LOG=fftw3-single-blfs.log
 
-LOG=fftw3-single-blfs.log
+extra_conf=""
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
 
 # TODO: gonna need to set extra_conf for each arch methinks...
@@ -72 +75 @@
 
 LOG=fftw3-double-blfs.log
-
+extra_conf=""
 if [ ! "${libdirname}" = "lib" ]; then
-   extra_conf="--libdir=/usr/${libdirname}"
+   extra_conf="${extra_conf} --libdir=/usr/${libdirname}"
 fi
 
@@ -124 +127 @@
 
 LOG=fftw3-long-double-blfs.log
-
+extra_conf=""
 if [ ! "${libdirname}" = "lib" ]; then
    extra_conf="--libdir=/usr/${libdirname}"