summaryrefslogtreecommitdiff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2012-02-25 20:02:41 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2012-02-25 20:05:54 +0100
commitfad26f7329b80b9c38bf782353f137246dd8fd07 (patch)
tree7e7fb90e4e3cd06a09027b687c7ce59e48f3069f /GNUmakefile
parent59fa9ceeea8d3694c03a533b306d846b7eb5b7c3 (diff)
downloadgnutls-fad26f7329b80b9c38bf782353f137246dd8fd07.tar.gz
Added timer_time.
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile14
1 files changed, 2 insertions, 12 deletions
diff --git a/GNUmakefile b/GNUmakefile
index d0fd3e8cfc..58f2ead461 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -20,20 +20,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Systems where /bin/sh is not the default shell need this. The $(shell)
-# command below won't work with e.g. stock DOS/Windows shells.
-ifeq ($(wildcard /bin/s[h]),/bin/sh)
-SHELL = /bin/sh
-else
-# will be used only with the next shell-test line, then overwritten
-# by a configured-in value
-SHELL = sh
-endif
-
# If the user runs GNU make but has not yet run ./configure,
# give them a diagnostic.
-_have-Makefile := $(shell test -f Makefile && echo yes)
-ifeq ($(_have-Makefile),yes)
+_gl-Makefile := $(wildcard [M]akefile)
+ifneq ($(_gl-Makefile),)
# Make tar archive easier to reproduce.
export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner