Merge branch 'master' into output

[pspp] / config / automake.mk

diff --git a/config/automake.mk b/config/automake.mk
index fa493d525498ab2ef9a9a34f0e92ccf71d4afeb7..509706e571bbbdaff246c8c91cca6c90923ba613 100644 (file)
--- a/config/automake.mk
+++ b/config/automake.mk
@@ -2,20 +2,6 @@
 
 
 dist_pkgsysconf_DATA = \
-       config/devices \
-       config/papersize
+       config/devices
 
-psfontsdir = $(pkgsysconfdir)/psfonts
-dist_psfonts_DATA = \
-       config/psfonts/Helvetica-Bold.afm \
-       config/psfonts/Times-Bold.afm \
-       config/psfonts/Courier-Bold.afm \
-       config/psfonts/Helvetica-BoldOblique.afm \
-       config/psfonts/Times-BoldItalic.afm \
-       config/psfonts/Courier-BoldOblique.afm \
-       config/psfonts/Helvetica-Oblique.afm \
-       config/psfonts/Times-Italic.afm \
-       config/psfonts/Courier-Oblique.afm \
-       config/psfonts/Helvetica.afm \
-       config/psfonts/Times-Roman.afm \
-       config/psfonts/Courier.afm
+EXTRA_DIST += config/OChangeLog