summaryrefslogtreecommitdiffstats
path: root/editors/abiword/files/patch-GNUmakefile.in
blob: 6385aea4d9af928a229a8b53393e35eeecba6409 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
--- GNUmakefile.in.orig Wed Jul 20 22:21:46 2005
+++ GNUmakefile.in  Wed Jul 20 22:23:12 2005
@@ -337,15 +337,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
+#icon_DATA = abiword_48.png
+#icondir = $(datadir)/icons
 @BIGENDIAN_FALSE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/LittleEndian32.american.hash
 @BIGENDIAN_TRUE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/BigEndian32.american.hash
 @WITH_ISPELL_FALSE@INSTALLDICTIONARY = no
@@ -844,7 +844,6 @@
 
 # Install the datafiles. This is quick-and-dirty.
 install-data-local:
-   @$(mkinstalldirs) $(DESTDIR)$(bonobodir)
    if test -d $(top_srcdir)/../abidistfiles ; then \
      for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
@@ -857,11 +856,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 \
-           $(INSTALL_DATA) $$file $(DESTDIR)$(bonobodir); \
-         else \
            $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/$$dir; \
-         fi; \
            fi; \
          done; \
        fi; \