summaryrefslogtreecommitdiff
path: root/ltconfig
diff options
context:
space:
mode:
authorlenz@mysql.com <>2003-01-27 13:44:16 +0100
committerlenz@mysql.com <>2003-01-27 13:44:16 +0100
commit82aca82da0c382ca0cc34549011fd47bd2502412 (patch)
tree08684f584a91f0a52e5b257f1ff35cd0c3e33223 /ltconfig
parent5758da1476da75e481f944de4ec91e5464ce7b00 (diff)
downloadmariadb-git-82aca82da0c382ca0cc34549011fd47bd2502412.tar.gz
- added a dummy file "reservedwords.texi" to the BK tree and the Makefiles,
so it's part of the distribution (manual.texi includes this file) It will be replaced with the correct one from the mysqldoc tree before building the distribution - removed generation and inclusion of MIRRORS file, since the mirror list is no longer part of manual.texi anyway - replaced YFLAGS with AM_YFLAGS in sql/Makefile.am to make automake happy - Redirect standard error when checking for dpkg-architecture in ltconfig to avoid error message showing during configuration
Diffstat (limited to 'ltconfig')
-rwxr-xr-xltconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/ltconfig b/ltconfig
index a5011a81c19..c4a16f77012 100755
--- a/ltconfig
+++ b/ltconfig
@@ -3013,7 +3013,7 @@ hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
# the DEB_BUILD_ARCH variable should be of non-zero length, indicating
# that we are in the middle of a Debian package build (assuming the
# user isn't doing anything strange with environment variables).
-if test -n "`dpkg-architecture -qDEB_BUILD_ARCH`" && ps | grep debuild | grep -v grep > /dev/null; then
+if test -n "`dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null`" && ps | grep debuild | grep -v grep > /dev/null; then
# Debian policy mandates that rpaths should not be encoded into a binary
# so it is overridden.
hardcode_libdir_flag_spec=" -D_DEBIAN_PATCHED_LIBTOOL_ "