netatalk: fix a crash on Solaris when registering with mDNS

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index 6225c165d3a7908b2a768c239584bfb5615790c1..c98a2abb7592f6c58c7a456a4165bd1baed0dbc7 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,10 +3,10 @@
 SUBDIRS = pam
 SUFFIXES = .tmpl .
 
-TMPLFILES = afp.conf.tmpl
-GENFILES = afp.conf
+TMPLFILES = afp.conf.tmpl dbus-session.conf.tmpl
+GENFILES = afp.conf dbus-session.conf
 CLEANFILES = $(GENFILES)
-EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf netatalk-dbus.conf
+EXTRA_DIST = $(TMPLFILES) extmap.conf netatalk-dbus.conf
 
 OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 
@@ -28,6 +28,7 @@ endif
            -e s@:ETCDIR:@${pkgconfdir}@ \
            -e s@:COMPILED_BACKENDS:@"$(compiled_backends)"@ \
            -e s@:DEFAULT_CNID_SCHEME:@$(DEFAULT_CNID_SCHEME)@ \
+               -e s@:LOCALSTATEDIR:@"$(localstatedir)"@ \
            <$< >$@
 
 #
@@ -48,13 +49,12 @@ uninstall-local:
        rm -f $(DESTDIR)$(pkgconfdir)/dbus-session.conf
        rm -f $(DESTDIR)$(localstatedir)/netatalk/README
        rm -f $(DESTDIR)$(localstatedir)/netatalk/CNID/README
-if USE_DEBIAN
+if USE_DEBIAN_SYSV
        rm -f $(DESTDIR)/etc/default/netatalk
 endif
 
 install-config-files: $(CONFFILES) $(GENFILES)
        $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
-       $(INSTALL_DATA) $(srcdir)/dbus-session.conf $(DESTDIR)$(pkgconfdir)
        @for f in $(CONFFILES) ; do \
                if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
                        echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \