From 36cd5f04c4e40dfeafb598a262d14d767557d337 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 6 Apr 2005 13:38:29 +0000 Subject: [PATCH] install a link to the gimp(1) man-page for gimp-console(1). 2005-04-06 Sven Neumann * docs/Makefile.am: install a link to the gimp(1) man-page for gimp-console(1). * docs/gimp.1.in: mention gimp-console. --- ChangeLog | 7 +++++++ docs/Makefile.am | 18 ++++++++++++++++-- docs/gimp.1.in | 15 +++++++++------ po/ChangeLog | 2 +- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5c6f93c14..3f9fd59614 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-04-06 Sven Neumann + + * docs/Makefile.am: install a link to the gimp(1) man-page for + gimp-console(1). + + * docs/gimp.1.in: mention gimp-console. + 2005-04-06 Sven Neumann * app/main.c: improved "--help" output. diff --git a/docs/Makefile.am b/docs/Makefile.am index 42e6376b40..13a8a49646 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,12 +1,12 @@ ## Process this file with automake to produce Makefile.in -default_binary_mans = \ +mans = \ gimp-$(GIMP_APP_VERSION).1 \ gimprc-$(GIMP_APP_VERSION).5 \ gimp-remote-$(GIMP_APP_VERSION).1 man_MANS = \ - $(default_binary_mans) \ + $(mans) \ gimptool-$(GIMP_TOOL_VERSION).1 EXTRA_DIST = \ @@ -18,7 +18,18 @@ EXTRA_DIST = \ quick_reference.ps \ quick_reference.tar.gz + +default_binary_mans = $(mans) +if ENABLE_GIMP_CONSOLE +default_binary_mans += gimp-console-$(GIMP_APP_VERSION).1 +endif + install-data-hook: +if ENABLE_GIMP_CONSOLE + cd $(DESTDIR)$(mandir)/man1; \ + rm -f gimp-console-$(GIMP_APP_VERSION).1; \ + ln -s gimp-$(GIMP_APP_VERSION).1 gimp-console-$(GIMP_APP_VERSION).1 +endif if DEFAULT_BINARY @list='$(default_binary_mans)'; \ for i in $$list; do \ @@ -35,6 +46,9 @@ if DEFAULT_BINARY endif uninstall-local: +if ENABLE_GIMP_CONSOLE + rm -f $(DESTDIR)$(mandir)/man1/gimp-console-$(GIMP_APP_VERSION).1 +endif if DEFAULT_BINARY @list='$(default_binary_mans)'; \ for i in $$list; do \ diff --git a/docs/gimp.1.in b/docs/gimp.1.in index 833852c1c8..fc83ef05d1 100644 --- a/docs/gimp.1.in +++ b/docs/gimp.1.in @@ -32,10 +32,13 @@ intelligent scissors, and select by color. .PP GIMP offers a variety of plugins that perform a variety of image manipulations. Examples include bumpmap, edge detect, gaussian blur, -and many others. +and many others. In addition, GIMP has several scripting extension +which allow for advanced non-interactive processing and creation of +images. .PP -In addition, GIMP has several scripting extension which allow for -advanced non-interactive processing and creation of images. +GIMP ships with a second binary called \fIgimp-console\fP. This binary +is a console-only version and behaves as if \fIgimp\fP was called with +the \-\-no\-interface command\-line option. .SH OPTIONS @@ -43,13 +46,13 @@ advanced non-interactive processing and creation of images. The \fIgimp\fP accepts the following options: .TP 8 .B \-h, \-\-help -Show GIMP commandline options. +Show GIMP command\-line options. .TP 8 .B \-\-help\-all -Show all commandline options. +Show all command\-line options. .TP 8 .B \-\-help-gtk -Show GTK+ commandline options. +Show GTK+ command\-line options. .TP 8 .B \-v, \-\-version Output the version info. diff --git a/po/ChangeLog b/po/ChangeLog index 9298f89389..06cc7b7d4f 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -30,7 +30,7 @@ 2005-04-01 Steve Murphy - * rw.po: Added Kinyarwanda translation. + * rw.po: Added Kinyarwanda translation. 2005-04-01 Sven Neumann