Merge sf.net

[netatalk.git] / etc / psf / Makefile.am

diff --git a/etc/psf/Makefile.am b/etc/psf/Makefile.am
index 513a6b27012b27073cf0f355d7c8c3e16ce18a0c..8cb795a99921718aaff7d6ef04ed383c52f58e88 100644 (file)
--- a/etc/psf/Makefile.am
+++ b/etc/psf/Makefile.am
@@ -1,18 +1,21 @@
 # Makefile.am for etc/psf/
 
-sbin_PROGRAMS = psf psa
+libexec_PROGRAMS = psf psa
+libexec_SCRIPTS = etc2ps.sh
+
+pkgdata_DATA = pagecount.ps
 
 psf_SOURCES = psf.c
 psa_SOURCES = psa.c
 
-CFLAGS = @CFLAGS@ -DZEROWIDTH \
+AM_CFLAGS = -DZEROWIDTH \
        -D_PATH_PAP=\"$(bindir)/pap\" \
        -D_PATH_PSORDER=\"$(bindir)/psorder\" \
-       -D_PATH_PSA=\"$(sbindir)/psa\" \
-       -D_PATH_PSFILTER=\"$(bindir)/etc2ps.sh\" \
-       -D_PATH_PAGECOUNT=\"$(CONFIG_DIR)/pagecount.ps\"
+       -D_PATH_PSA=\"$(libexecdir)/psa\" \
+       -D_PATH_PSFILTER=\"$(libexecdir)/etc2ps.sh\" \
+       -D_PATH_PAGECOUNT=\"$(pkgdatadir)/pagecount.ps\"
 
-EXTRA_DIST = etc2ps.sh
+EXTRA_DIST = $(libexec_SCRIPTS) $(pkgdata_DATA)
 
 # declare links
 psf_LINKS = ofpap ifpap tfpap ifpaprev tfpaprev ofwpap ifwpap \
@@ -24,14 +27,23 @@ psf_LINKS = ofpap ifpap tfpap ifpaprev tfpaprev ofwpap ifwpap \
 # install sections for links
 #
 
-install-data-local:
+install-exec-hook:
+       @list='$(psf_LINKS)'; for l in $$list; do \
+               rm $(DESTDIR)$(libexecdir)/$$l 2>/dev/null || true; \
+               (cd $(DESTDIR)$(libexecdir) && $(LN_S) psf $$l);  \
+       done
+
+#
+# uninstall sections for links
+#
+
+uninstall-hook:
        @list='$(psf_LINKS)'; for l in $$list; do \
-               $(LN_S) -f psf $(DESTDIR)$(sbindir)/$$l;  \
+               rm -f $(DESTDIR)$(libexecdir)/$$l; \
        done
 
 #
 # cleanup
 #
 
-clean distclean clean-recursive distclean-recursive:
-       $(RM) -r $(psf_LINKS) *.o core .libs .deps
+CLEANFILES = $(psf_LINKS)