diff options
Diffstat (limited to 'editors/abiword/files/patch-GNUmakefile.in')
| -rw-r--r-- | editors/abiword/files/patch-GNUmakefile.in | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/editors/abiword/files/patch-GNUmakefile.in b/editors/abiword/files/patch-GNUmakefile.in index ad9a02ccfca8..e7b1b3f4059a 100644 --- a/editors/abiword/files/patch-GNUmakefile.in +++ b/editors/abiword/files/patch-GNUmakefile.in @@ -1,33 +1,31 @@ ---- GNUmakefile.in.orig Thu Jun 17 14:48:13 2004 -+++ GNUmakefile.in Thu Jun 17 14:49:43 2004 -@@ -149,17 +149,17 @@ - +--- GNUmakefile.in.orig Wed Jan 5 15:28:11 2005 ++++ GNUmakefile.in Wed Jan 5 15:30:55 2005 +@@ -315,15 +315,15 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ SUBDIRS = src - -expat_peerdir = $(top_builddir)/../expat -wv_peerdir = $(top_builddir)/../wv -libiconv_peerdir = $(top_builddir)/../libiconv -libpng_peerdir = @LIBPNG_PEERDIR@ -libpopt_peerdir = $(top_builddir)/../popt +-desktop_DATA = abiword.desktop +-desktopdir = $(datadir)/applications +-icon_DATA = abiword_48.png +-icondir = $(datadir)/icons +#expat_peerdir = $(top_builddir)/../expat +#wv_peerdir = $(top_builddir)/../wv +#libiconv_peerdir = $(top_builddir)/../libiconv +#libpng_peerdir = @LIBPNG_PEERDIR@ +#libpopt_peerdir = $(top_builddir)/../popt - --desktop_DATA = abiword.desktop --desktopdir = $(datadir)/applications +#desktop_DATA = abiword.desktop +#desktopdir = $(datadir)/applications - --icon_DATA = abiword_48.png --icondir = $(datadir)/icons +#icon_DATA = abiword_48.png +#icondir = $(datadir)/icons - - @BIGENDIAN_TRUE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/BigEndian32.american.hash @BIGENDIAN_FALSE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/LittleEndian32.american.hash -@@ -550,7 +550,6 @@ + @BIGENDIAN_TRUE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/BigEndian32.american.hash + @WITH_ISPELL_FALSE@INSTALLDICTIONARY = no +@@ -816,7 +816,6 @@ # Install the datafiles. This is quick-and-dirty. install-data-local: @@ -35,8 +33,8 @@ if test -d $(top_srcdir)/../abidistfiles ; then \ for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\ -@@ -563,11 +562,7 @@ - for file in $(top_srcdir)/../abidistfiles/$$dir/* ; do \ +@@ -829,11 +828,7 @@ + for file in `echo $(top_srcdir)/../abidistfiles/$$dir/* | grep -v MANIFEST`; do \ if test -f $$file ; then \ sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \ - if test "$$sfile.server" = $$file; then \ |