From 4cdbcdeea15a1ea35ad9ab218b28393d0ee60882 Mon Sep 17 00:00:00 2001 From: Tobias Oetiker Date: Sun, 18 Jan 2015 14:27:41 +0100 Subject: [PATCH] sync configure --- CHANGES | 42 ++++++++++++++++++++++++++++++++++++++++++ configure | 4 ++-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 1a7cd808..cc3008b3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,45 @@ +commit 890a7500693ac895d7ade73e37ed2418f16a1bfa +Author: Tobias Oetiker +Date: Sun Jan 18 14:26:05 2015 +0100 + + we need spaces around the equal signs + +commit 6f0a1c1ebebe40b4f981f708b36d041a141c00a6 +Author: Dominik Hassler +Date: Sat Jan 17 15:52:58 2015 +0100 + + - env variables for pre and post znap scripts use added + +commit 5b0b32b3f40f0c64219cacb901b7b6678801e24f +Author: Dominik Hassler +Date: Fri Jan 16 14:32:42 2015 +0100 + + - clear properties before set + +commit 2e58ef0731dd98d97ce09b97c7d7fb56a66fac82 +Author: Dominik Hassler +Date: Sat Jan 3 18:31:03 2015 +0100 + + - only process features if not empty + +commit d3b20b7327036bf5e826c28943eeca9e10855677 +Author: Dominik Hassler +Date: Thu Dec 18 13:45:51 2014 +0100 + + - warn instead of print + +commit a3c588bc2fd0825656707816ab9d0a2a57ec23b9 +Author: Dominik Hassler +Date: Wed Dec 17 12:09:01 2014 +0100 + + - warn instead of die if mbuffer is not present + +commit 3d2c470cb38a60fe21001db0b9f0b5ef246d2c98 +Author: Tobias Oetiker +Date: Tue Dec 16 23:48:06 2014 +0100 + + ready for 0.14.0 + commit 3cdad5ed0bab8c99da972a18fbc122bb8520e6db Author: Tobias Oetiker Date: Tue Dec 16 23:47:24 2014 +0100 diff --git a/configure b/configure index 65b02015..cb65e7d0 100755 --- a/configure +++ b/configure @@ -2542,11 +2542,11 @@ if test x$exec_prefix = xNONE; then exec_prefix=$actual_prefix fi -if test x$datarootdir=x'${prefix}/share'; then +if test x$datarootdir = x'${prefix}/share'; then datarootdir=$actual_prefix/share fi -if test x$mandir=x'${datarootdir}/man'; then +if test x$mandir = x'${datarootdir}/man'; then mandir=$datarootdir/man fi