- merge branch-netatalk-afp-3x-dev, HEAD was tagged before

[netatalk.git] / bin / afppasswd / Makefile.am

diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
index daff8d41b8edd4e5ba288a3941c47833a972aaf7..b9fad222a1e4d4f76243de6e9203b4d8df8c12f3 100644 (file)
--- a/bin/afppasswd/Makefile.am
+++ b/bin/afppasswd/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for bin/afppasswd/
 
-pkgconfdir = $(PKGCONFDIR)
+pkgconfdir = @PKGCONFDIR@
 
 if USE_DHX
 bin_PROGRAMS = afppasswd
@@ -8,21 +8,13 @@ else
 bin_PROGRAMS =
 endif
 
-if HAVE_GCRYPT
-CRYPT_CFLAGS = $(GCRYPT_CFLAGS)
-CRYPT_LIBS = $(GCRYPT_LIBS)
-else
-CRYPT_CFLAGS = $(SSL_CFLAGS)
-CRYPT_LIBS = $(SSL_LIBS)
-endif
-
 afppasswd_SOURCES = afppasswd.c
-afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la $(CRYPT_LIBS)
+afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la @SSL_LIBS@
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys $(CRYPT_CFLAGS) \
-       -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
+CFLAGS = @CFLAGS@ @SSL_CFLAGS@ -I$(top_srcdir)/sys \
+    -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
 
 install-exec-hook:
 if USE_DHX
        chmod u+s $(DESTDIR)$(bindir)/afppasswd
-endif
+endif
\ No newline at end of file