aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2015-03-07 20:32:51 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2015-03-07 20:32:51 +0100
commit4a4687c4ce4e5aa09e54531c662355d294dcaa6c (patch)
tree4b298871cd1fd8653b5b5772a3256c36a5e392c3
parent2a4e114c20feb53e80133c530ebbfddbaf69a94a (diff)
downloadsciteco-4a4687c4ce4e5aa09e54531c662355d294dcaa6c.tar.gz
improved --help output and introduced PACKAGE_URL_DEV (for development home)
* The PACKAGE_URL_DEV is also mentioned in --help output and sciteco(1)
-rw-r--r--bootstrap.am1
-rw-r--r--configure.ac4
-rw-r--r--doc/sciteco.1.in7
-rw-r--r--src/main.cpp15
4 files changed, 24 insertions, 3 deletions
diff --git a/bootstrap.am b/bootstrap.am
index 0707420..bdbb819 100644
--- a/bootstrap.am
+++ b/bootstrap.am
@@ -10,6 +10,7 @@ SUBST_MACRO = eb$<\e \
<fs@PACKAGE_NAME^Q@\e@PACKAGE_NAME@\e;>j \
<fs@PACKAGE_VERSION^Q@\e@PACKAGE_VERSION@\e;>j \
<fs@PACKAGE_URL^Q@\e@PACKAGE_URL@\e;>j \
+ <fs@PACKAGE_URL_DEV^Q@\e@PACKAGE_URL_DEV@\e;>j \
<fs@bindir^Q@\e$(bindir)\e;>j \
<fs@pkgdatadir^Q@\e$(pkgdatadir)\e;>j \
<fs@scitecolibdir^Q@\e$(scitecolibdir)\e;>j \
diff --git a/configure.ac b/configure.ac
index d1760b8..a419345 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,10 @@ AC_INIT([SciTECO], [0.6],
[robin.haberkorn@googlemail.com],
[sciteco],
[http://sciteco.sf.net/])
+PACKAGE_URL_DEV=https://github.com/rhaberkorn/sciteco
+AC_SUBST(PACKAGE_URL_DEV)
+AC_DEFINE_UNQUOTED(PACKAGE_URL_DEV, ["$PACKAGE_URL_DEV"],
+ [Package development homepage.])
AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE
diff --git a/doc/sciteco.1.in b/doc/sciteco.1.in
index 6bc0f98..077d807 100644
--- a/doc/sciteco.1.in
+++ b/doc/sciteco.1.in
@@ -213,7 +213,12 @@ Language reference:
.TP
Homepage:
.UR @PACKAGE_URL@
-\*(ST
+\*(ST at Sourceforge
+.UE
+.TP
+Development home, bug tracker and wiki:
+.UR @PACKAGE_URL_DEV@
+\*(ST at Github
.UE
.TP
Related dialects:
diff --git a/src/main.cpp b/src/main.cpp
index ed054d7..a2de09e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -117,7 +117,8 @@ process_options(int &argc, char **&argv)
{"eval", 'e', 0, G_OPTION_ARG_STRING, &eval_macro,
"Evaluate macro", "macro"},
{"mung", 'm', 0, G_OPTION_ARG_FILENAME, &mung_file,
- "Mung file instead of " INI_FILE, "file"},
+ "Mung file instead of "
+ "$SCITECOCONFIG" G_DIR_SEPARATOR_S INI_FILE, "file"},
{NULL}
};
@@ -126,7 +127,17 @@ process_options(int &argc, char **&argv)
GOptionContext *options;
GOptionGroup *interface_group = interface.get_options();
- options = g_option_context_new("- " PACKAGE_STRING);
+ options = g_option_context_new("[--] [ARGUMENT...]");
+
+ g_option_context_set_summary(
+ options,
+ PACKAGE_STRING " -- Scintilla-based Text Editor and COrrector"
+ );
+ g_option_context_set_description(
+ options,
+ "Bug reports should go to <" PACKAGE_BUGREPORT "> or "
+ "<" PACKAGE_URL_DEV ">."
+ );
g_option_context_add_main_entries(options, option_entries, NULL);
if (interface_group)