Changeset 83ea618

Timestamp:

Feb 21, 2006, 12:25:06 AM (18 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:

662fbfc

Parents:

b15e4602

Message:

r613@server (orig r611): ryan | 2005-08-05 23:41:20 -0700
Update

File:

• scripts/untested/blfs-scripts/blfs-foomatic.sh (modified) (5 diffs)

scripts/untested/blfs-scripts/blfs-foomatic.sh

@@ -19 +19 @@
 
 min_log_init ${INSTLOGS}
-make install 
+make install \
   >> ${LOGFILE} 2>&1 &&
 echo " o Install OK" || barf
@@ -26 +26 @@
 LOG=foomatic-db-hpijs-blfs.log
 
-unpack_tarball foomatic-db-hpijs-${FOOMATIC_DB_HPIJS_VER}
+unpack_tarball foomatic-db-hpijs-${FOOMATIC_DB_HPIJS_VER}-current
 cd ${PKGDIR}
 
@@ -35 +35 @@
 echo " o Configure OK" &&
 
+min_log_init ${BUILDLOGS}
+make \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
 min_log_init ${INSTLOGS}
-make install 
+make install \
   >> ${LOGFILE} 2>&1 &&
 echo " o Install OK" || barf
@@ -52 +57 @@
 echo " o Configure OK" &&
 
+min_log_init ${BUILDLOGS}
+make \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
 min_log_init ${INSTLOGS}
-make install
+make install \
   >> ${LOGFILE} 2>&1 &&
 echo " o Install OK" || barf
@@ -69 +79 @@
 fi
 
-#### we probably want libxml2 
-cd ${SRC}
-LOG=foomatic-db-engine-blfs.log
-
-unpack_tarball foomatic-db-engine-${FOOMATIC_DB_ENG_VER}
-cd ${PKGDIR}
-
-max_log_init foomatic-db-engine ${FOOMATIC_DB_ENG_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
-CC="${CC-gcc} ${ARCH_CFLAGS}" \
-./configure --prefix=/usr \
-  >> ${LOGFILE} 2>&1 &&
-echo " o Configure OK" &&
-
-min_log_init ${INSTLOGS}
-make install
-  >> ${LOGFILE} 2>&1 &&
-echo " o Install OK" || barf
-
-if [ ! "${libdirname}" = "lib" ]; then
-   # additional symlinks for lib64 cups, ppr to get the foomatic filters
-   # TODO: this needs to be done better
-
-   mkdir -p /usr/${libdirname}/cups/filter
-   ln -sf /usr/bin/foomatic-rip /usr/${libdirname}/cups/filter
-   mkdir -p /usr/${libdirname}/ppr/interfaces
-   mkdir -p /usr/${libdirname}/ppr/lib
-   ln -sf /usr/bin/foomatic-rip /usr/${libdirname}/ppr/interfaces
-   ln -sf /usr/bin/foomatic-rip /usr/${libdirname}/ppr/lib
-fi
-