From 2fb5d15ce38d8d298c4fbf8c0bb336154a314b13 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 1 Jun 2004 00:06:14 +0000 Subject: Build fixing for FreeBSD. GNU make is installed as gmake, so make a MAKE variable (defaults to "make") and use that. Use the MKDEP and MKDEP_OPTIONS more. Our shell isn't bash, so change the instances of ">& /dev/null" to a more compatible "> /dev/null 2>&1". --- progs/Makefile | 4 ++-- progs/miniglx/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'progs') diff --git a/progs/Makefile b/progs/Makefile index c44c9d73e4..d6b0477a43 100644 --- a/progs/Makefile +++ b/progs/Makefile @@ -10,7 +10,7 @@ SUBDIRS = $(PROGRAM_DIRS) default: $(TOP)/configs/current @for dir in $(SUBDIRS) ; do \ if [ -d $$dir ] ; then \ - (cd $$dir ; make) || exit 1 ; \ + (cd $$dir ; $(MAKE)) || exit 1 ; \ fi \ done @@ -18,6 +18,6 @@ default: $(TOP)/configs/current clean: @for dir in $(SUBDIRS) tests ; do \ if [ -d $$dir ] ; then \ - (cd $$dir ; make clean) ; \ + (cd $$dir ; $(MAKE) clean) ; \ fi \ done diff --git a/progs/miniglx/Makefile b/progs/miniglx/Makefile index 6e6b0a8548..825d50a47c 100644 --- a/progs/miniglx/Makefile +++ b/progs/miniglx/Makefile @@ -47,7 +47,7 @@ clean: depend: $(SOURCES) touch depend - makedepend -fdepend -Y $(INCLUDES) $(SOURCES) >& /dev/null + $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 2>&1 # Emacs tags -- cgit v1.2.3