projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a5d68df
)
Quote $$answer to avoid error on null value.
author
hal9
<hal9@users.sourceforge.net>
Thu, 24 Oct 2002 00:40:46 +0000
(
00:40
+0000)
committer
hal9
<hal9@users.sourceforge.net>
Thu, 24 Oct 2002 00:40:46 +0000
(
00:40
+0000)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
4702cfc
..
9b91452
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,4
+1,4
@@
-# $Id: Makefile,v 1.
8 2002/10/23 05:41:45
agotneja Exp $
+# $Id: Makefile,v 1.
9 2002/10/23 06:14:09
agotneja Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# Privoxy team. http://www.privoxy.org/
#
# Written by and Copyright (C) 2001 the SourceForge
# Privoxy team. http://www.privoxy.org/
@@
-26,6
+26,9
@@
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# $Log: Makefile,v $
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# $Log: Makefile,v $
+# Revision 1.9 2002/10/23 06:14:09 agotneja
+# Added FreeBSD checks to stop people from using the default 'make'
+#
# Revision 1.8 2002/10/23 05:41:45 agotneja
# Added checks for Solaris 'make' command, and more extensive checks that
# the user is running GNU make.
# Revision 1.8 2002/10/23 05:41:45 agotneja
# Added checks for Solaris 'make' command, and more extensive checks that
# the user is running GNU make.
@@
-72,7
+75,7
@@
error:
@if [ -f GNUmakefile ]; then \
echo "***"; \
echo "*** You are not using the GNU version of Make - maybe it's called gmake"; \
@if [ -f GNUmakefile ]; then \
echo "***"; \
echo "*** You are not using the GNU version of Make - maybe it's called gmake"; \
- echo "*** or it's in a different
directory?"
; \
+ echo "*** or it's in a different
PATH? Please read INSTALL."
; \
echo "***"; \
exit 1; \
elif test -n "$(HOST_ARCH)" && test -z "$(MAKE_VERSION)" ; then \
echo "***"; \
exit 1; \
elif test -n "$(HOST_ARCH)" && test -z "$(MAKE_VERSION)" ; then \
@@
-94,7
+97,7
@@
error:
echo "***"; \
echo -n "*** Shall I do this for you now? (y/n) "; \
read answer; \
echo "***"; \
echo -n "*** Shall I do this for you now? (y/n) "; \
read answer; \
- if [
$$answer
= "y" ]; then \
+ if [
"$$answer"
= "y" ]; then \
autoheader && autoconf && ./configure || exit 1; \
if $(GNU_MAKE_CMD) -v |grep GNU >/dev/null 2>/dev/null; then \
$(GNU_MAKE_CMD) ;\
autoheader && autoconf && ./configure || exit 1; \
if $(GNU_MAKE_CMD) -v |grep GNU >/dev/null 2>/dev/null; then \
$(GNU_MAKE_CMD) ;\
@@
-102,6
+105,7
@@
error:
$(MAKE_CMD) ;\
else \
echo "Neither 'make' nor 'gmake' are GNU compatible!" ; \
$(MAKE_CMD) ;\
else \
echo "Neither 'make' nor 'gmake' are GNU compatible!" ; \
+ echo "Please read INSTALL." ; \
exit 1 ; \
fi ;\
fi; \
exit 1 ; \
fi ;\
fi; \