[build] Rename DATADIR with EVINCEDATADIR

[evince.git] / thumbnailer / Makefile.am

diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index e46d86024a7a681c0c0cf373f5bbb0825a1bc9f5..171c00f6ee313c012e1d345014cd9eeb7b9ef759 100644 (file)
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -1,4 +1,3 @@
-@INTLTOOL_SCHEMAS_RULE@
 
 bin_PROGRAMS = evince-thumbnailer
 
@@ -6,7 +5,7 @@ evince_thumbnailer_SOURCES = \
        evince-thumbnailer.c
 
 evince_thumbnailer_CPPFLAGS = \
-       -DDATADIR=\"$(pkgdatadir)\"             \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"       \
        -I$(top_srcdir)                         \
        -I$(top_builddir)                       \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
@@ -19,14 +18,16 @@ evince_thumbnailer_CFLAGS = \
        $(WARN_CFLAGS)          \
        $(AM_CFLAGS)
 
-evince_thumbnailer_LDADD = \
-       $(top_builddir)/libdocument/libevdocument.la    \
-       $(FRONTEND_LIBS)
+evince_thumbnailer_LDFLAGS = $(AM_LDFLAGS)
 
 if PLATFORM_WIN32
-evince_thumbnailer_LDFLAGS = -mwindows
+evince_thumbnailer_LDFLAGS += -mwindows
 endif
 
+evince_thumbnailer_LDADD = \
+       $(top_builddir)/libdocument/libevdocument.la    \
+       $(FRONTEND_LIBS)
+
 schema_files = \
        evince-thumbnailer-dvi.schemas.in  \
        evince-thumbnailer-djvu.schemas.in \
@@ -34,6 +35,10 @@ schema_files = \
        evince-thumbnailer-ps.schemas.in \
        evince-thumbnailer.schemas.in
 
+if WITH_GCONF
+
+@INTLTOOL_SCHEMAS_RULE@
+
 schema_DATA = 
 
 if ENABLE_PDF
@@ -67,8 +72,12 @@ if GCONF_SCHEMAS_INSTALL
        fi
 endif
 
+endif # WITH_GCONF
+
 EXTRA_DIST =           \
        $(schema_files)  
 
 DISTCLEANFILES = \
        $(schema_DATA)
+
+-include $(top_srcdir)/git.mk