49 lines
1.7 KiB
Text
49 lines
1.7 KiB
Text
--- GNUmakefile.in.orig Thu Jun 17 14:48:13 2004
|
|
+++ GNUmakefile.in Thu Jun 17 14:49:43 2004
|
|
@@ -149,17 +149,17 @@
|
|
|
|
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
|
|
+#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 @@
|
|
|
|
# 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 ;\
|
|
@@ -563,11 +562,7 @@
|
|
for file in $(top_srcdir)/../abidistfiles/$$dir/* ; 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; \
|