Backport of etc/psf/Makefile.am build fix from Steven N. Hirsch.

diff --git a/NEWS b/NEWS
index 8987e1df4f56b9c75c2672bdb441b8b1fb224a45..58ecd72598959ce4ec27dccc461a40edaf5a01a8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ Changes in 1.6.1
        of Berkeley DB are supported.
 * FIX: Codepage file maccode.koi8-r is now correctly cleaned.
 * FIX: Fix init script location on SuSE. [Olaf]
-* FIX: Build fixes. [Olaf]
+* FIX: Build fixes. [Olaf, Steven N. Hirsch]
 * FIX: Various bugs when a user doesn't have access permission to a folder.
        (Fixes an OSX kernel panic.)
 * FIX: CNID, folders' DID handling with concurrent access or symlinks.

diff --git a/etc/psf/Makefile.am b/etc/psf/Makefile.am
index 16cc68045c708efb9db9818901c0b02651fb09a1..956d6d953b8d2ba3496214c92db09f74d91b7542 100644 (file)
--- a/etc/psf/Makefile.am
+++ b/etc/psf/Makefile.am
@@ -26,10 +26,10 @@ psf_LINKS = ofpap ifpap tfpap ifpaprev tfpaprev ofwpap ifwpap \
 # install sections for links
 #
 
-install-exec-local:
+install-exec-hook:
        @list='$(psf_LINKS)'; for l in $$list; do \
                rm $(DESTDIR)$(sbindir)/$$l 2>/dev/null || true; \
-               $(LN_S) psf $(DESTDIR)$(sbindir)/$$l;  \
+               (cd $(DESTDIR)$(sbindir) && $(LN_S) psf $$l);  \
        done
 
 #