summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-01-09 11:12:51 +0100
committerSimon Josefsson <simon@josefsson.org>2008-01-09 11:12:51 +0100
commit1f724e4bedabd60892359f34ed9745f50192a304 (patch)
tree594a1758137c0fe28852cb5e6656514d111d2ef3
parent0fa84f1e5706a101c5e39cc3f12777bc0f8f5e3d (diff)
downloadgnutls-1f724e4bedabd60892359f34ed9745f50192a304.tar.gz
Re-add config.rpath hack, since gnulib updated config.rpath.
-rw-r--r--GNUmakefile1
-rw-r--r--maint-cfg.mk3
2 files changed, 3 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 8bef04f65d..96f00f3432 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,6 +3,7 @@ ifneq ($(have-gnulib-files),yes)
gnulib.mk:
ln -s build-aux/GNUmakefile gnulib.mk || cp build-aux/GNUmakefile gnulib.mk
ln -s build-aux/maint.mk maint.mk || cp build-aux/maint.mk maint.mk
+ mv build-aux/config.rpath{,-}
endif
-include gnulib.mk
diff --git a/maint-cfg.mk b/maint-cfg.mk
index 1d77fba6b0..4ccabe13db 100644
--- a/maint-cfg.mk
+++ b/maint-cfg.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Free Software Foundation
+# Copyright (C) 2006, 2007, 2008 Free Software Foundation
#
# Author: Simon Josefsson
#
@@ -28,6 +28,7 @@ endif
autoreconf:
test -f ./configure || autoreconf --install
+ mv build-aux/config.rpath{-,}
bootstrap: autoreconf
./configure $(CFGFLAGS)