1 files changed, 17 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a1c65ed..df8280c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.7
 
 NULL =
 
-saverdir = $(libexecdir)/mate-screensaver
+saverdir = $(pkglibexecdir)
 themesdir = $(pkgdatadir)/themes
 
 AM_CPPFLAGS = \
@@ -21,9 +21,11 @@ AM_CPPFLAGS = \
 -DDATADIR=\""$(datadir)"\" \
 -DSYSCONFDIR=\""$(sysconfdir)"\" \
 -DMATELOCALEDIR=\""$(datadir)/locale"\" \
+ -DPKGLIBEXECDIR=\""$(pkglibexecdir)"\" \
 -DSAVERDIR=\""$(saverdir)"\" \
 -DTHEMESDIR=\""$(themesdir)"\" \
 -DGTKBUILDERDIR=\"$(pkgdatadir)\" \
+ -DMATE_SCREENSAVER_GL_HELPER_PATH=\""$(libexecdir)/mate-screensaver-gl-helper"\" \
 -DPAM_SERVICE_NAME=\""mate-screensaver"\" \
 $(WARN_CFLAGS) \
 $(AUTH_CFLAGS) \
@@ -57,7 +59,7 @@ desktopdir = $(sysconfdir)/xdg/autostart
 desktop_in_files = mate-screensaver.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 $(desktop_DATA): $(desktop_in_files)
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@
 
 mate_screensaver_command_SOURCES = \
 mate-screensaver-command.c \
@@ -69,6 +71,7 @@ mate_screensaver_command_LDADD = \
 
 AUTH_SOURCES = \
 gs-auth.h \
+ gs-auth-pam.h \
 gs-auth-@[email protected] \
 $(NULL)
 
@@ -99,6 +102,11 @@ test_passwd_LDADD = \
 $(AUTH_LIBS) \
 $(NULL)
 
+if HAVE_PASSWD_HELPER
+test_passwd_LDADD += \
+ ../helper/libhelper-proto.a
+endif
+
 test_watcher_SOURCES = \
 test-watcher.c \
 gs-watcher.h \
@@ -161,6 +169,13 @@ mate_screensaver_dialog_LDADD = \
 $(LIBNOTIFY_LIBS) \
 $(NULL)
 
+if HAVE_PASSWD_HELPER
+mate_screensaver_dialog_LDADD += \
+ ../helper/libhelper-proto.a
+../helper/libhelper-proto.a:
+ $(MAKE) -C ../helper
+endif
+
 BUILT_SOURCES = \
 gs-marshal.c \
 gs-marshal.h \