Small Makefile fixes.
/trunk/Makefile.in | 29 17 12 0 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
1.1 --- a/Makefile.in Sun Dec 28 09:38:35 2008 +0000
1.2 +++ b/Makefile.in Sun Dec 28 10:19:50 2008 +0000
1.3 @@ -6,21 +6,6 @@
1.4 all: Makefile build
1.5
1.6 ###############################################################################
1.7 -# Sanity checks
1.8 -
1.9 -# Check if Makefile is up to date:
1.10 -Makefile: Makefile.in
1.11 - @echo "$< did changed: you must re-run './configure'"
1.12 - @false
1.13 -
1.14 -# If installing with DESTDIR, check it's an absolute path
1.15 -ifneq ($(strip $(DESTDIR)),)
1.16 - ifneq ($(DESTDIR),$(abspath /$(DESTDIR)))
1.17 - $(error DESTDIR is not an absolute PATH: '$(DESTDIR)')
1.18 - endif
1.19 -endif
1.20 -
1.21 -###############################################################################
1.22 # Configuration variables
1.23
1.24 VERSION:= @@VERSION@@
1.25 @@ -30,7 +15,27 @@
1.26 MANDIR := @@MANDIR@@
1.27 DATE := @@DATE@@
1.28 LOCAL := @@LOCAL@@
1.29 -MAKE := $(shell which $(MAKE) || type -p $(MAKE) || echo /usr/bin/make)
1.30 +MAKE := $(shell which $(MAKE) 2>/dev/null || type -p $(MAKE) 2>/dev/null || echo "ct-ng:nomake")
1.31 +
1.32 +###############################################################################
1.33 +# Sanity checks
1.34 +
1.35 +# Check if Makefile is up to date:
1.36 +Makefile: Makefile.in
1.37 + @echo "$< did changed: you must re-run './configure'"
1.38 + @false
1.39 +
1.40 +# Check we do have make
1.41 +ifeq ($(strip $(MAKE)),ct-ng:nomake)
1.42 + $(error 'make' was not found on your system)
1.43 +endif
1.44 +
1.45 +# If installing with DESTDIR, check it's an absolute path
1.46 +ifneq ($(strip $(DESTDIR)),)
1.47 + ifneq ($(DESTDIR),$(abspath /$(DESTDIR)))
1.48 + $(error DESTDIR is not an absolute PATH: '$(DESTDIR)')
1.49 + endif
1.50 +endif
1.51
1.52 ###############################################################################
1.53 # Global make rules