From 280da912276bf3805ed48aa52df80b11ba77e9f1 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 26 Jun 2003 14:29:45 +0000
Subject: [PATCH] - more fixes

Changed files:
    gaby-DESTDIR.patch -> 1.2
---
 gaby-DESTDIR.patch | 72 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 65 insertions(+), 7 deletions(-)

diff --git a/gaby-DESTDIR.patch b/gaby-DESTDIR.patch
index 35f7e72..0ff47c0 100644
--- a/gaby-DESTDIR.patch
+++ b/gaby-DESTDIR.patch
@@ -1,6 +1,6 @@
---- src/Makefile.in~	Sat Jul  7 12:31:45 2001
-+++ src/Makefile.in	Mon Oct  8 23:04:42 2001
-@@ -660,10 +660,10 @@
+--- gaby-2.0.2/src/Makefile.am.orig	Mon Jun 18 14:59:10 2001
++++ gaby-2.0.2/src/Makefile.am	Tue Jun 24 12:12:27 2003
+@@ -113,10 +113,10 @@
  install-exec-local:
  	for F in $(APPS); \
  	do \
@@ -8,10 +8,68 @@
 -		then rm $(prefix)/bin/$$F; fi ; \
 -		if [ ! -f $(prefix)/bin/$$F ]; \
 -		then ln -s gaby $(prefix)/bin/$$F; fi ; \
-+		if [ -h $(DESTDIR)$(prefix)/bin/$$F ]; \
-+		then rm $(DESTDIR)$(prefix)/bin/$$F; fi ; \
-+		if [ ! -f $(DESTDIR)$(prefix)/bin/$$F ]; \
-+		then ln -s gaby $(DESTDIR)$(prefix)/bin/$$F; fi ; \
++		if [ -h $(DESTDIR)$(bindir)/$$F ]; \
++		then rm -f $(DESTDIR)$(bindir)/$$F; fi ; \
++		if [ ! -f $(DESTDIR)$(bindir)/$$F ]; \
++		then ln -s gaby $(DESTDIR)$(bindir)/$$F; fi ; \
  	done
  
  distclean-local:
+--- gaby-2.0.2/Makefile.am.orig	Mon Jun 18 14:59:08 2001
++++ gaby-2.0.2/Makefile.am	Tue Jun 24 12:13:04 2003
+@@ -8,8 +8,8 @@
+ 		gabybuilder.desktop gnome-gaby-builder.png
+ 
+ install-exec-local:
+-	./mkinstalldirs $(prefix)/share/doc/gaby
+-	cp COPYING $(prefix)/share/doc/gaby
++	./mkinstalldirs $(DESTDIR)$(prefix)/share/doc/gaby
++	cp COPYING $(DESTDIR)$(prefix)/share/doc/gaby
+ 	-test -z "$(SKIPGNOMEDATA)" && ( \
+ 	    gnome-config --datadir &> /dev/null && \
+ 	    cp gnome-gaby*.png \
+--- gaby-2.0.2/plug-ins/actions/Makefile.am.orig	Wed Sep 27 14:27:21 2000
++++ gaby-2.0.2/plug-ins/actions/Makefile.am	Tue Jun 24 12:48:16 2003
+@@ -5,5 +5,4 @@
+ SUBDIRS = net stat scripts cd $(GNOME_ONLY)
+ 
+ showsubdirs:
+-	# $(SUBDIRS)
+ 
+--- gaby-2.0.2/plug-ins/actions/gnomepim/Makefile.am.orig	Mon Jun 18 14:59:09 2001
++++ gaby-2.0.2/plug-ins/actions/gnomepim/Makefile.am	Tue Jun 24 13:14:34 2003
+@@ -21,7 +21,7 @@
+ CORBA_SRCLIST = \
+ 	gnome-pim-common.c gnome-pim-skels.c gnome-pim-stubs.c gnome-pim.h
+ 
+-CLEANFILES += $(CORBA_SRCLIST)
++CLEANFILES = $(CORBA_SRCLIST)
+ 
+ $(CORBA_SRCLIST): gnome-pim.idl
+ 	orbit-idl gnome-pim.idl
+--- gaby-2.0.2/plug-ins/interpreter/Makefile.am.orig	Tue Aug  3 22:39:00 1999
++++ gaby-2.0.2/plug-ins/interpreter/Makefile.am	Tue Jun 24 13:15:13 2003
+@@ -8,5 +8,4 @@
+ SUBDIRS = $(PYTHON)
+ 
+ showsubdirs:
+-	# $(SUBDIRS)
+ 
+--- gaby-2.0.2/plug-ins/view/Makefile.am.orig	Sat Jan  8 16:54:49 2000
++++ gaby-2.0.2/plug-ins/view/Makefile.am	Tue Jun 24 13:15:26 2003
+@@ -11,5 +11,4 @@
+ 	  $(GNOME_ONLY) $(GLADE_ONLY)
+ 
+ showsubdirs:
+-	# $(SUBDIRS)
+ 
+--- gaby-2.0.2/configure.in.orig	Sat Jul  7 12:28:49 2001
++++ gaby-2.0.2/configure.in	Tue Jun 24 13:37:26 2003
+@@ -276,7 +276,6 @@
+ ALL_LINGUAS="da de es fi fr ja nl no pl sv"
+ 
+ AM_GNU_GETTEXT
+-AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in >po/Makefile])
+ 
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ 
-- 
2.43.0