summaryrefslogtreecommitdiffstats
path: root/progs
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2004-06-01 00:06:14 +0000
committerEric Anholt <[email protected]>2004-06-01 00:06:14 +0000
commit2fb5d15ce38d8d298c4fbf8c0bb336154a314b13 (patch)
tree51f1626c3f3054216174bba640ecb5425ba80647 /progs
parentc1311d80bd0b2661581bb510c18780d7603cd014 (diff)
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".
Diffstat (limited to 'progs')
-rw-r--r--progs/Makefile4
-rw-r--r--progs/miniglx/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/progs/Makefile b/progs/Makefile
index c44c9d73e4a..d6b0477a43a 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 6e6b0a85486..825d50a47c3 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