[PATCH] Give the user a chance to decide what browser to use.

Cristian Ionescu-Idbohrn cristian.ionescu-idbohrn at axis.com
Mon Jan 2 09:48:41 PST 2012


Signed-off-by: Cristian Ionescu-Idbohrn <cii at axis.com>
---
 Documentation/Makefile |    4 +++-
 Makefile               |    7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 273eae5..528b621 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,5 +1,7 @@
 ASCIIDOC=asciidoc
-BROWSER=firefox
+BROWSER=$(shell echo `which x-www-browser 2>/dev/null || \
+	which iceweasel 2>/dev/null || \
+	which firefox 2>/dev/null`)

 doc: user-manual.html

diff --git a/Makefile b/Makefile
index c875130..7f6b5fb 100644
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,10 @@ $(OSSUPPORT).o: $(OSSUPPORT).c display-gtk.h
 	$(CC) $(CFLAGS) $(OSSUPPORT_CFLAGS) -c $(OSSUPPORT).c

 doc:
-	$(MAKE) -C Documentation doc
+	$(MAKE) -C Documentation $@
+
+show: doc
+	$(MAKE) -C Documentation $@

 clean:
-	rm -f $(OBJS) *~ $(NAME)
+	rm -f $(OBJS) *~ $(NAME) Documentation/*.html
-- 
1.7.7.3


More information about the subsurface mailing list