From db118e69ffd31b637f8dedb5fce1835ba6ca11ea Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Thu, 6 Dec 2001 22:17:24 +0000 Subject: [PATCH] Add man page for mozilla. Change default --prefix back to /usr/local . Thanks to Jan Schumann for the man page. Bug #94220 r=blizzard git-svn-id: svn://10.0.0.236/trunk@109875 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/autoconf.mk.in | 8 ++ mozilla/configure.in | 3 +- mozilla/xpfe/bootstrap/Makefile.in | 11 +++ mozilla/xpfe/bootstrap/mozilla.man.in | 137 ++++++++++++++++++++++++++ 4 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 mozilla/xpfe/bootstrap/mozilla.man.in diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index d67eb560b1b..56e3ab46ee0 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -25,6 +25,14 @@ USE_AUTOCONF = 1 MOZILLA_CLIENT = 1 NO_MDUPDATE = 1 BUILD_MODULES = @BUILD_MODULES@ +MOZILLA_VERSION = @MOZILLA_VERSION@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +includedir = @includedir@ +libdir = @libdir@ +datadir = @datadir@ DIST = $(DEPTH)/dist diff --git a/mozilla/configure.in b/mozilla/configure.in index a19ca0006ca..d3ffe600ac0 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -37,10 +37,11 @@ AC_PREREQ(2.12) AC_INIT(config/config.mk) AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) AC_CANONICAL_SYSTEM -AC_PREFIX_DEFAULT(`pwd`/dist) TARGET_CPU="${target_cpu}" TARGET_VENDOR="${target_vendor}" TARGET_OS="${target_os}" +MOZILLA_VERSION='0.9.6+' +AC_SUBST(MOZILLA_VERSION) dnl ======================================================== dnl = diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index 5d9628ea781..b634cc567aa 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -253,6 +253,17 @@ endif CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS) +ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) +libs:: mozilla.1 + $(INSTALL) $< $(DIST)/man/man1 + +mozilla.1: mozilla.man.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk + @sed -e "s|\@bindir\@|${bindir}|" -e "s|\@libdir\@|${libdir}|" \ + -e "s|\@mozilla_version\@|${MOZILLA_VERSION}|" < $< > $@ + +GARBAGE += mozilla.1 +endif + ifneq ($(MOZ_WIDGET_TOOLKIT),os2) libs:: $(srcdir)/mozilla $(INSTALL) $< $(DIST)/bin diff --git a/mozilla/xpfe/bootstrap/mozilla.man.in b/mozilla/xpfe/bootstrap/mozilla.man.in new file mode 100644 index 00000000000..ccc7556e070 --- /dev/null +++ b/mozilla/xpfe/bootstrap/mozilla.man.in @@ -0,0 +1,137 @@ +.TH MOZILLA 1 "August 07, 2001" mozilla "Linux User's Manual" +.SH NAME +mozilla \- a Web browser for X11 derived from Netscape Communicator + +.SH SYNOPSIS +.B mozilla +[\fIOPTIONS\fR] [\fIURL\fR] + +.B mozilla-bin +[\fIOPTIONS\fR] [\fIURL\fR] + +.SH DESCRIPTION +\fBMozilla\fR is an open-source web browser, designed for standards compliance, +performance and portability. + +.SH USAGE +\fBmozilla\fR is a simple shell script that will set up the environment for +the actual executable, \fBmozilla-bin\fR. + +.SH OPTIONS +A summary of the options supported by \fBmozilla\fR is included below. + +.SS "GTK options" +\fB\-\-gdk-debug=\fR\fIFLAGS\fR +Gdk debugging flags to set +.TP +\fB\-\-gdk-no-debug=\fR\fIFLAGS\fR +Gdk debugging flags to unset +.TP +\fB\-\-gtk-debug=\fR\fIFLAGS\fR +Gtk+ debugging flags to set +.TP +\fB\-\-gtk-no-debug=\fR\fIFLAGS\fR +Gtk+ debugging flags to unset +.TP +\fB\-\-gtk-module=\fR\fIMODULE\fR +Load an additional Gtk module + +.SS "X11 options" +.TP +.BI \-\-display= DISPLAY +X display to use +.TP +.B \--sync +Make X calls synchronous +.TP +.B \-\-no-xshm +Don't use X shared memory extension +.TP +.BI \-\-xim-preedit= STYLE +.TP +.BI \-\-xim-status= STYLE +.TP +.B \-\-g-fatal-warnings +Make all warnings fatal + +.SS "Mozilla options" +.TP +\fB\-height\fR \fIvalue\fR +Set height of startup window to \fIvalue\fR. +.TP +.B \-h, \-help +Show summary of options. +.TP +.B \-installer +Start with 4.x migration window. +.TP +\fB\-width\fR \fIvalue\fR +Set width of startup window to \fIvalue\fR. +.TP +.B \-v, \-version +Print \fB/usr/bin/mozilla-bin\fR version. +.TP +\fB\-CreateProfile\fR \fIprofile\fR +Create \fIprofile\fR. +.TP +\fB\-P\fR \fIprofile\fR +Start with \fIprofile\fR. +.TP +.B \-ProfileWizard +Start with profile wizard. +.TP +.B \-ProfileManager +Start with profile manager. +.TP +.B \-SelectProfile +Start with profile selection dialog. +.TP +\fB\-lang\fR \fIlang-region\fR +Start with \fIlang-region\fR resources. +.TP +\fB\-remote\fR \fIcommand\fR +Execute \fIcommand\fR in an already running Mozilla process. For more info, +see: \fIhttp://www.mozilla.org/unix/remote.html\fR +.TP +.B \-splash +Enable splash screen. +.TP +.B \-addressbook +Start with the addressbook. +.TP +.B \-news +Start with news. +.TP +.B \-jsconsole +Start with Javascript Console +.TP +\fB\-edit\fR \fIurl\fR +Start with editor. +.TP +\fB\-chrome\fR \fIurl\fR +Load the specified chrome. +.TP +.B \-mail +Start with mail. +.TP +\fB\-compose\fR \fIurl\fR +Start with messenger compose. + +.SH FILES +\fI@bindir@/mozilla\fR - shell script wrapping \fBmozilla\fR +.br +\fI@libdir@/mozilla/mozilla-bin\fR - \fBmozilla\fR executable + +.SH VERSION +@mozilla_version@ + +.SH BUGS +To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR + +.SH "SEE ALSO" +.BR galeon(1) + +.SH AUTHORS +.TP +.B The Mozilla Organization +.I http://www.mozilla.org/about.html