summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/binutils/intl
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2004-05-17 21:54:57 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2004-05-17 21:54:57 +0000
commit631eeff208608ed7b44459bd6c8ae905bcd7e8b6 (patch)
tree7be124105a0929655708fbbc134f9c2e3189c3f3 /gnu/usr.bin/binutils/intl
parenta7c8e0ae4a4b349099d02bc9d56bcf1979c0f0c3 (diff)
Resolve merge conflicts, adjust method of W^X handing (.sh files)
remove testsuites (not useable) remove mmalloc (not part of new binutils).
Diffstat (limited to 'gnu/usr.bin/binutils/intl')
-rw-r--r--gnu/usr.bin/binutils/intl/configure2
-rw-r--r--gnu/usr.bin/binutils/intl/stamp-h1
2 files changed, 1 insertions, 2 deletions
diff --git a/gnu/usr.bin/binutils/intl/configure b/gnu/usr.bin/binutils/intl/configure
index febdc735551..341eea019ae 100644
--- a/gnu/usr.bin/binutils/intl/configure
+++ b/gnu/usr.bin/binutils/intl/configure
@@ -528,7 +528,7 @@ fi
ac_aux_dir=
-for ac_dir in ${GNUSYSTEM_AUX_DIR} $srcdir $srcdir/.. $srcdir/../..; do
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
diff --git a/gnu/usr.bin/binutils/intl/stamp-h b/gnu/usr.bin/binutils/intl/stamp-h
deleted file mode 100644
index 9788f70238c..00000000000
--- a/gnu/usr.bin/binutils/intl/stamp-h
+++ /dev/null
@@ -1 +0,0 @@
-timestamp