diff --git a/ChangeLog b/ChangeLog index af1ad51f68..4265a8b893 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2002-02-02 Manish Singh + + * configure.in + * Makefile.am + * app/Makefile.am + * docs/Makefile.am + * plug-ins/print/Makefile.am + * tools/Makefile.am + * (the various manpages): versioned the binaries and manpages. + Added an --enable-default-binary switch to configure to make + symlinks for unversioned things (defaults to no for 1.3). The + perl stuff isn't touched, but that's disabled in the build here + anyway. + 2002-02-01 Manish Singh * libgimpwidgets/gimppatheditor.[ch]: treeviewized and undeprecated diff --git a/Makefile.am b/Makefile.am index faf8df43da..1b57cd1e7f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,7 +32,7 @@ bin_SCRIPTS = gimptool-1.3 @GIMPINSTALL@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gimp-1.3.pc gimpui-1.3.pc -EXTRA_SCRIPTS = gimpinstall +EXTRA_SCRIPTS = gimpinstall-1.3 EXTRA_DIST = \ AUTHORS \ @@ -60,13 +60,17 @@ EXTRA_DIST = \ po-script-fu/script-fu-xgettext \ po-script-fu/update.sh -gimpinstall: - $(LN_S) $(srcdir)/install-sh $(srcdir)/gimpinstall +gimpinstall-1.3: + $(LN_S) $(srcdir)/install-sh $(srcdir)/gimpinstall-1.3 -install-exec-local: +install-exec-hook: +if DEFAULT_BINARY cd $(DESTDIR)$(bindir) \ - && rm -f gimp-config-1.3 \ - && $(LN_S) gimptool-1.3 gimp-config-1.3 + && rm -f gimptool \ + && $(LN_S) gimptool-1.3 gimptool +endif uninstall-local: - rm -f $(DESTDIR)$(bindir)/gimp-config-1.3 +if DEFAULT_BINARY + rm -f $(DESTDIR)$(bindir)/gimptool +endif diff --git a/app/Makefile.am b/app/Makefile.am index 1e4b42ec57..5d5a359328 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -152,3 +152,15 @@ gimp_1_3_LDADD = @STRIP_BEGIN@ \ $(INTLLIBS) \ $(REGEXREPL) \ @STRIP_END@ + +install-exec-hook: +if DEFAULT_BINARY + cd $(DESTDIR)$(bindir) \ + && rm -f gimp \ + && $(LN_S) gimp-1.3 gimp +endif + +uninstall-local: +if DEFAULT_BINARY + rm -f $(DESTDIR)$(bindir)/gimp +endif diff --git a/docs/Makefile.am b/docs/Makefile.am index 3453a83e0e..bdaf844cf9 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -3,13 +3,13 @@ # Don't install any man-pages for now. They need to be updated and # would clash with older gimp installations. -# man_MANS = gimp.1 gimptool-1.3.1 gimprc.5 +man_MANS = gimp-1.3.1 gimptool-1.3.1 gimp-remote-1.3.1 gimprc-1.3.5 EXTRA_DIST = \ - gimp.1.in \ + gimp-1.3.1.in \ gimptool-1.3.1.in \ - gimp-remote.1.in \ - gimprc.5.in \ + gimp-remote-1.3.1.in \ + gimprc-1.3.5.in \ Wilber.svg \ Wilber.xcf.gz \ Wilber.xcf.gz.README \ @@ -19,3 +19,38 @@ EXTRA_DIST = \ keybindings.txt \ quick_reference.ps \ quick_reference.tar.gz + +install-data-hook: +if DEFAULT_BINARY + @list='$(man_MANS)'; \ + for i in $$list; do \ + s=`echo $$i | sed -e 's/.*\\(.\\)$$/\1/'`; \ + n=`echo $$i | sed -e 's/-[^-]*$$//'`; \ + f="$$n.$$s"; \ + echo "cd $(DESTDIR)$(mandir)/man$$s"; \ + cd $(DESTDIR)$(mandir)/man$$s; \ + echo "rm -f $$f"; \ + rm -f $$f; \ + echo "ln -s $$i $$f"; \ + ln -s $$i $$f; \ + done +endif + +uninstall-local: +if DEFAULT_BINARY + @list='$(man_MANS)'; \ + for i in $$list; do \ + s=`echo $$i | sed -e 's/.*\\(.\\)$$/\1/'`; \ + n=`echo $$i | sed -e 's/-[^-]*$$//'`; \ + f="$$n.$$s"; \ + echo " rm -f $(DESTDIR)$(mandir)/man$$s/$$f"; \ + rm -f $(DESTDIR)$(mandir)/man$$s/$$f; \ + done +endif + +.PHONY: files + +files: + @files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \ + echo $$p; \ + done diff --git a/plug-ins/print/.cvsignore b/plug-ins/print/.cvsignore index 5cff1a3eca..8bd906e268 100644 --- a/plug-ins/print/.cvsignore +++ b/plug-ins/print/.cvsignore @@ -4,5 +4,5 @@ Makefile _libs .libs print -escputil -escputil.1 +escputil-1.3 +escputil-1.3.1 diff --git a/plug-ins/print/Makefile.am b/plug-ins/print/Makefile.am index a555531966..f1f49e5e47 100644 --- a/plug-ins/print/Makefile.am +++ b/plug-ins/print/Makefile.am @@ -10,7 +10,7 @@ libexecdir = $(gimpplugindir)/plug-ins libexec_PROGRAMS = print -bin_PROGRAMS = escputil +bin_PROGRAMS = escputil-1.3 print_SOURCES = @STRIP_BEGIN@ \ print-canon.c \ @@ -31,9 +31,9 @@ print_SOURCES = @STRIP_BEGIN@ \ print_gimp.h \ @STRIP_END@ -escputil_SOURCES = escputil.c +escputil_1_3_SOURCES = escputil.c -man_MANS = escputil.1 +man_MANS = escputil-1.3.1 EXTRA_DIST = print-printers.c @@ -59,4 +59,41 @@ LDADD = @STRIP_BEGIN@ \ $(INTLLIBS) \ @STRIP_END@ -escputil_LDADD = +escputil_1_3_LDADD = + +install-exec-hook: +if DEFAULT_BINARY + cd $(DESTDIR)$(bindir) \ + && rm -f escputil \ + && $(LN_S) escputil-1.3 escputil +endif + +install-data-hook: +if DEFAULT_BINARY + @list='$(man_MANS)'; \ + for i in $$list; do \ + s=`echo $$i | sed -e 's/.*\\(.\\)$$/\1/'`; \ + n=`echo $$i | sed -e 's/-[^-]*$$//'`; \ + f="$$n.$$s"; \ + echo "cd $(DESTDIR)$(mandir)/man$$s"; \ + cd $(DESTDIR)$(mandir)/man$$s; \ + echo "rm -f $$f"; \ + rm -f $$f; \ + echo "ln -s $$i $$f"; \ + ln -s $$i $$f; \ + done +endif + +uninstall-local: +if DEFAULT_BINARY + @echo " rm -f $(DESTDIR)$(bindir)/escputil"; \ + rm -f $(DESTDIR)$(bindir)/escputil + @list='$(man_MANS)'; \ + for i in $$list; do \ + s=`echo $$i | sed -e 's/.*\\(.\\)$$/\1/'`; \ + n=`echo $$i | sed -e 's/-[^-]*$$//'`; \ + f="$$n.$$s"; \ + echo " rm -f $(DESTDIR)$(mandir)/man$$s/$$f"; \ + rm -f $(DESTDIR)$(mandir)/man$$s/$$f; \ + done +endif diff --git a/plug-ins/print/escputil-1.2.1.in b/plug-ins/print/escputil-1.2.1.in deleted file mode 100644 index 02636d8256..0000000000 --- a/plug-ins/print/escputil-1.2.1.in +++ /dev/null @@ -1,104 +0,0 @@ -.TH ESCPUTIL 1 @GIMP_PRINT_RELEASE_DATE@ "Version @GIMP_PRINT_VERSION@" "GIMP Manual Pages" -.SH NAME -escputil - maintain Epson Stylus inkjet printers -.SH SYNOPSIS -.B escputil [\-P printer \| \-r device] [\-m model] [\-u] -[\-c \| \-n | \-a \| \-i] [\-q] - -.SH DESCRIPTION -.PP -\fIescputil\fP is a command line utility to perform various -maintenance tasks on Epson Stylus inkjet printers. These tasks -include head alignment, head cleaning, nozzle check, printer -identification, and retrieval of ink level from the printer. - -.SH OPTIONS -.l -\fIescputil\fP accepts the following options: -.TP 8 -.B \-P, \-\-printer-name \fI\fP -Specify the name of the printer to operate on. -Default is the default system printer. -.TP 8 -.B \-r, \-\-raw-device \fI\fP -Specify the name of the device to write to directly -rather than going through a printer queue. You must use this (rather -than specifying a printer) when retrieving ink levels or identifying -the printer, or if you wish to perform head alignment without -specifying the printer model. -.TP 8 -.B \-c, \-\-clean-head -Clean the print head. This can also be performed from the printer -front panel. -.TP 8 -.B \-n, \-\-nozzle-check -Print a nozzle test pattern. Dirty or clogged nozzles will show as -gaps in the pattern. If you see any gaps, you should run a -head cleaning pass or two. -.TP 8 -.B \-a, \-\-align-head -Align the print head. CAUTION: Misuse of this utility may result in -poor print quality and/or damage to the printer. You must either -specify the printer model with the \-m option, or use the raw printer -device to allow escputil to detect the printer model. -.TP 8 -.B \-i, \-\-ink-level -Obtain the ink level from the printer. This requires -read/write access to the raw printer device. -.TP 8 -.B \-d, \-\-identify -Query the printer for make and model information. -This requires read/write access to the raw printer -device. -.TP 8 -.B \-u -The printer is connected via USB. -.TP 8 -.B \-h, \-\-help -Display a list of all commandline options. -.TP 8 -.B \-q, \-\-quiet -Suppress the banner. -.TP 8 -.B \-m -Specify the precise printer model for head alignment. - -.SH COPYRIGHT -Copyright \(co 2000 Robert Krawitz (rlk@alum.mit.edu) - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2 of the License, or (at your option) -any later version. - -.SH OTHER INFO - -The canonical place to find GIMP info is at http://www.gimp.org/. -The homepage of the gimp-print project from which this utility was -contributed is located at http://gimp-print.sourceforge.net/. - -.SH AUTHORS -Robert Krawitz. - -.SH BUGS - -.PP -USB-connected printers sometimes fail to identify or return ink -levels. You may have to repeat the command. This is probably a -timing issue in escputil, not a flaw in the printer. - -.PP -Anything requiring bidirectional communication with the printer -(identify, ink levels, or head alignment without specifying the -printer model) requires read/write access to the printer port (for -example /dev/lp0). This may require these operations to be performed -as root. - -.PP -If the printer is performing self-test or head cleaning on power -up, the identify and ink level commands will time out, although the -printer successfully receives the command. The command will need to -be reissued when the printer is quiescent. - -.SH "SEE ALSO" -.BR gimp (1) diff --git a/plug-ins/print/escputil.1.in b/plug-ins/print/escputil.1.in deleted file mode 100644 index 02636d8256..0000000000 --- a/plug-ins/print/escputil.1.in +++ /dev/null @@ -1,104 +0,0 @@ -.TH ESCPUTIL 1 @GIMP_PRINT_RELEASE_DATE@ "Version @GIMP_PRINT_VERSION@" "GIMP Manual Pages" -.SH NAME -escputil - maintain Epson Stylus inkjet printers -.SH SYNOPSIS -.B escputil [\-P printer \| \-r device] [\-m model] [\-u] -[\-c \| \-n | \-a \| \-i] [\-q] - -.SH DESCRIPTION -.PP -\fIescputil\fP is a command line utility to perform various -maintenance tasks on Epson Stylus inkjet printers. These tasks -include head alignment, head cleaning, nozzle check, printer -identification, and retrieval of ink level from the printer. - -.SH OPTIONS -.l -\fIescputil\fP accepts the following options: -.TP 8 -.B \-P, \-\-printer-name \fI\fP -Specify the name of the printer to operate on. -Default is the default system printer. -.TP 8 -.B \-r, \-\-raw-device \fI\fP -Specify the name of the device to write to directly -rather than going through a printer queue. You must use this (rather -than specifying a printer) when retrieving ink levels or identifying -the printer, or if you wish to perform head alignment without -specifying the printer model. -.TP 8 -.B \-c, \-\-clean-head -Clean the print head. This can also be performed from the printer -front panel. -.TP 8 -.B \-n, \-\-nozzle-check -Print a nozzle test pattern. Dirty or clogged nozzles will show as -gaps in the pattern. If you see any gaps, you should run a -head cleaning pass or two. -.TP 8 -.B \-a, \-\-align-head -Align the print head. CAUTION: Misuse of this utility may result in -poor print quality and/or damage to the printer. You must either -specify the printer model with the \-m option, or use the raw printer -device to allow escputil to detect the printer model. -.TP 8 -.B \-i, \-\-ink-level -Obtain the ink level from the printer. This requires -read/write access to the raw printer device. -.TP 8 -.B \-d, \-\-identify -Query the printer for make and model information. -This requires read/write access to the raw printer -device. -.TP 8 -.B \-u -The printer is connected via USB. -.TP 8 -.B \-h, \-\-help -Display a list of all commandline options. -.TP 8 -.B \-q, \-\-quiet -Suppress the banner. -.TP 8 -.B \-m -Specify the precise printer model for head alignment. - -.SH COPYRIGHT -Copyright \(co 2000 Robert Krawitz (rlk@alum.mit.edu) - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2 of the License, or (at your option) -any later version. - -.SH OTHER INFO - -The canonical place to find GIMP info is at http://www.gimp.org/. -The homepage of the gimp-print project from which this utility was -contributed is located at http://gimp-print.sourceforge.net/. - -.SH AUTHORS -Robert Krawitz. - -.SH BUGS - -.PP -USB-connected printers sometimes fail to identify or return ink -levels. You may have to repeat the command. This is probably a -timing issue in escputil, not a flaw in the printer. - -.PP -Anything requiring bidirectional communication with the printer -(identify, ink levels, or head alignment without specifying the -printer model) requires read/write access to the printer port (for -example /dev/lp0). This may require these operations to be performed -as root. - -.PP -If the printer is performing self-test or head cleaning on power -up, the identify and ink level commands will time out, although the -printer successfully receives the command. The command will need to -be reissued when the printer is quiescent. - -.SH "SEE ALSO" -.BR gimp (1) diff --git a/tools/.cvsignore b/tools/.cvsignore index d2e15e5967..a8b3c0962b 100644 --- a/tools/.cvsignore +++ b/tools/.cvsignore @@ -3,4 +3,4 @@ Makefile.in .deps .libs kernelgen -gimp-remote +gimp-remote-1.3 diff --git a/tools/Makefile.am b/tools/Makefile.am index 4e1ff0f70d..5c260bafac 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -20,9 +20,9 @@ EXTRA_PROGRAMS = \ gimp-remote \ kernelgen -gimp_remote_SOURCES = gimp-remote.c +gimp_remote_1_3_SOURCES = gimp-remote.c -gimp_remote_LDADD = @STRIP_BEGIN@ \ +gimp_remote_1_3_LDADD = @STRIP_BEGIN@ \ $(GTK_LIBS) \ $(LIBXMU) \ @STRIP_END@ @@ -38,3 +38,18 @@ INCLUDES = @STRIP_BEGIN@ \ EXTRA_DIST = \ gimppath2svg.py \ rmshm + +## if DEFAULT_BINARY +## install-exec-hook: +## @if test -f "$(DESTDIR)$(bindir)/gimp-remote-1.3"; then \ +## echo "cd $(DESTDIR)$(bindir)"; \ +## cd $(DESTDIR)$(bindir); \ +## echo "rm -f gimp-remote"; \ +## rm -f gimp-remote; \ +## echo "$(LN_S) gimp-remote-1.3 gimp-remote"; \ +## $(LN_S) gimp-remote-1.3 gimp-remote; \ +## fi +## +## uninstall-local: +## rm -f $(DESTDIR)$(bindir)/gimp-remote +## endif