[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / properties / Makefile.am

diff --git a/properties/Makefile.am b/properties/Makefile.am
index 33d831efa9388ebd3a8d839a36a91afb137e4fe2..ecbb5d9473be1d0484a820a3b4d11ea18405a715 100644 (file)
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES=                                      \
-       -DDATADIR=\"$(pkgdatadir)\"             \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"       \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
        -I$(top_srcdir)                         \
        -I$(top_builddir)                       \
@@ -14,23 +14,22 @@ libevproperties_la_SOURCES=                 \
        ev-properties-view.c                    \
        ev-properties-view.h
 
-if HAVE_NAUTILUS
-EVINCE_PROPERTIES_PAGE = libevince-properties-page.la
-else
-EVINCE_PROPERTIES_PAGE =
-endif
+if ENABLE_NAUTILUS
 
-nautilus_LTLIBRARIES = $(EVINCE_PROPERTIES_PAGE)
+nautilusextension_LTLIBRARIES = libevince-properties-page.la
 
-nautilusdir=$(NAUTILUS_EXTENSION_DIR)
 libevince_properties_page_la_CFLAGS = -I$(top_srcdir)
 libevince_properties_page_la_SOURCES =         \
        ev-properties-main.c
 
 libevince_properties_page_la_LIBADD =          \
        libevproperties.la                      \
-       $(top_builddir)/libdocument/libevdocument.la    \
+       $(top_builddir)/libdocument/libevdocument3.la   \
        $(FRONTEND_LIBS)                        \
        $(NAUTILUS_LIBS)
 
 libevince_properties_page_la_LDFLAGS = -module -avoid-version -no-undefined
+
+endif # ENABLE_NAUTILUS
+
+-include $(top_srcdir)/git.mk