From 2802b47f593ba891cf52d6e8903df08dcbfb883d Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Sun, 4 Apr 2004 19:23:30 +0000 Subject: [PATCH] Makefile.am don't install gimptool symlinks to gimptool-2.0 and its 2004-04-04 Sven Neumann * Makefile.am * docs/Makefile.am: don't install gimptool symlinks to gimptool-2.0 and its manpage. gimp.m4 as installed with gimp-1.2 looks for gimptool (bug #139024). --- ChangeLog | 9 ++++++++- Makefile.am | 12 ------------ docs/Makefile.am | 11 +++++++---- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index d059be9e31..d5b3b47afa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,16 @@ +2004-04-04 Sven Neumann + + * Makefile.am + * docs/Makefile.am: don't install gimptool symlinks to + gimptool-2.0 and its manpage. gimp.m4 as installed with gimp-1.2 + looks for gimptool (bug #139024). + 2004-04-04 Sven Neumann * app/display/gimpdisplayshell-callbacks.c * app/display/gimpdisplayshell-draw.[ch] pass the bounding box of the exposed area to gimp_display_shell_draw_grid() and draw only - the relevant part of the grid. Fixes bug #138606. + the relevant part of the grid. Fixes bug #138081. 2004-04-04 Sven Neumann diff --git a/Makefile.am b/Makefile.am index 1a0209d6ca..cce342fc46 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,15 +73,3 @@ DISTCLEANFILES = \ gimpinstall-@GIMP_TOOL_VERSION@: $(LN_S) $(srcdir)/install-sh $(srcdir)/gimpinstall-@GIMP_TOOL_VERSION@ - -install-exec-hook: -if DEFAULT_BINARY - cd $(DESTDIR)$(bindir) \ - && rm -f gimptool \ - && $(LN_S) gimptool-@GIMP_TOOL_VERSION@ gimptool -endif - -uninstall-local: -if DEFAULT_BINARY - rm -f $(DESTDIR)$(bindir)/gimptool -endif diff --git a/docs/Makefile.am b/docs/Makefile.am index a3bc074ac6..42e6376b40 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,11 +1,14 @@ ## Process this file with automake to produce Makefile.in -man_MANS = \ +default_binary_mans = \ gimp-$(GIMP_APP_VERSION).1 \ - gimptool-$(GIMP_TOOL_VERSION).1 \ gimprc-$(GIMP_APP_VERSION).5 \ gimp-remote-$(GIMP_APP_VERSION).1 +man_MANS = \ + $(default_binary_mans) \ + gimptool-$(GIMP_TOOL_VERSION).1 + EXTRA_DIST = \ Wilber.svg \ Wilber.xcf.gz \ @@ -17,7 +20,7 @@ EXTRA_DIST = \ install-data-hook: if DEFAULT_BINARY - @list='$(man_MANS)'; \ + @list='$(default_binary_mans)'; \ for i in $$list; do \ s=`echo $$i | sed -e 's/.*\\(.\\)$$/\1/'`; \ n=`echo $$i | sed -e 's/-[^-]*$$//'`; \ @@ -33,7 +36,7 @@ endif uninstall-local: if DEFAULT_BINARY - @list='$(man_MANS)'; \ + @list='$(default_binary_mans)'; \ for i in $$list; do \ s=`echo $$i | sed -e 's/.*\\(.\\)$$/\1/'`; \ n=`echo $$i | sed -e 's/-[^-]*$$//'`; \