Force compile_et and mk_cmds to use /usr/bin/awk so that we will work

on any Debian system regardless of which version of awk is installed.
(Closes: #299341)

diff --git a/debian/changelog b/debian/changelog
index 75a9ca8..b58a316 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+e2fsprogs (1.36release-2) unstable; urgency=low
+
+  * Fix the missing translations (caused by a bug in the gen-tarball script).
+    (Closes: #296769)
+  * Force compile_et and mk_cmds to use /usr/bin/awk so that we will work
+    on any Debian system regardless of which version of awk is installed.
+    (Closes: #299341)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Thu, 17 Mar 2005 00:19:49 -0500
+
 e2fsprogs (1.36release-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/rules b/debian/rules
index 6fb1d85..27e8e2b 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -114,10 +114,10 @@ ${CFGSTDSTAMP}:
 
        mkdir -p ${stdbuilddir}
 ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-       cd ${stdbuilddir} && \
+       cd ${stdbuilddir} && AWK=/usr/bin/awk \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS}
 else
-       cd ${stdbuilddir} && CC="${DEB_HOST_GNU_TYPE}-gcc" \
+       cd ${stdbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \
                --build=$(DEB_BUILD_GNU_TYPE) $(DEB_HOST_GNU_TYPE)
 endif
@@ -125,7 +125,7 @@ endif
   # specially-built MIPS lib
        if [ ismips = "${ismips}" ]; then \
                mkdir -p ${mipsbuilddir} ; \
-               cd ${mipsbuilddir} && \
+               cd ${mipsbuilddir} && AWK=/usr/bin/awk \
                        ${topdir}/configure ${MIPS_NOPIC_CONF_FLAGS} ; \
        fi
 
@@ -138,10 +138,10 @@ ${CFGBFSTAMP}:
 
        mkdir -p ${bfbuilddir}
 ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-       cd ${bfbuilddir} && \
+       cd ${bfbuilddir} && AWK=/usr/bin/awk \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS}
 else
-       cd ${bfbuilddir} && CC="${DEB_HOST_GNU_TYPE}-gcc" \
+       cd ${bfbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \
                --build=$(DEB_BUILD_GNU_TYPE) $(DEB_HOST_GNU_TYPE)
 endif