Fix bugs in installation targets.

diff --git a/config/ChangeLog b/config/ChangeLog
index 57301e52d277d69966b07f1fd7d6bec8f2e5f0c3..292a289f249c1f50745c1e46971840bc58a7c79a 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+Tue Apr  4 20:20:49 2006  Ben Pfaff  <blp@gnu.org>
+
+       * automake.mk: Fix bugs in installation targets.
+
 Mon Apr  3 11:01:16 2006  Ben Pfaff  <blp@gnu.org>
 
        * automake.mk: (pkgsysconf_DATA) Add AFM files in config/psfonts.

diff --git a/config/automake.mk b/config/automake.mk
index a6e4697c5c3300807c36494c706ea0ba3eb49bcf..c0b2343b192bdb8058cbcac07c94256bfecf71e1 100644 (file)
--- a/config/automake.mk
+++ b/config/automake.mk
@@ -1,9 +1,12 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 
-pkgsysconf_DATA = \
+dist_pkgsysconf_DATA = \
        config/devices \
-       config/papersize \
+       config/papersize
+
+psfontsdir = $(pkgsysconfdir)/psfonts
+dist_psfonts_DATA = \
        config/psfonts/Helvetica-Bold.afm \
        config/psfonts/Times-Bold.afm \
        config/psfonts/Courier-Bold.afm \
@@ -17,17 +20,19 @@ pkgsysconf_DATA = \
        config/psfonts/Times-Roman.afm \
        config/psfonts/Courier.afm
  
-EXTRA_DIST += $(pkgsysconf_DATA)
-
 # A `private installation' in my terms is just having the appropriate
 # configuration files in ~/.pspp instead of a global configuration
 # location.  So I let those files be installed automatically.
 
 private-install:
-       $(mkinstalldirs) $$HOME/.pspp $$HOME/.pspp/psfonts
-       cd $(top_srcdir); cp $(pkgsysconf_DATA) $$HOME/.pspp
+       $(mkinstalldirs) $$HOME/.pspp
+       cd $(top_srcdir) && cp $(dist_pkgsysconf_DATA) $$HOME/.pspp
+       $(mkinstalldirs) $$HOME/.pspp/psfonts
+       cd $(top_srcdir) && cp $(dist_psfonts_DATA) $$HOME/.pspp/psfonts
+
 
 private-uninstall:
-       -cd $$HOME/.pspp && rm $(notdir $(pkgsysconf_DATA))
+       -cd $$HOME/.pspp && rm $(notdir $(dist_pkgsysconf_DATA))
+       -cd $$HOME/.pspp/psfonts && rm $(notdir $(dist_psfonts_DATA))
        -rmdir $$HOME/.pspp/psfonts $$HOME/.pspp