[Pspp-cvs] pspp/config ChangeLog automake.mk

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/04/05 03:21:07

Modified files:
        config         : ChangeLog automake.mk 

Log message:
        Fix bugs in installation targets.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/config/ChangeLog.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/config/automake.mk.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: pspp/config/ChangeLog
diff -u pspp/config/ChangeLog:1.4 pspp/config/ChangeLog:1.5
--- pspp/config/ChangeLog:1.4   Mon Apr  3 20:07:54 2006
+++ pspp/config/ChangeLog       Wed Apr  5 03:21:07 2006
@@ -1,3 +1,7 @@
+Tue Apr  4 20:20:49 2006  Ben Pfaff  <address@hidden>
+
+       * automake.mk: Fix bugs in installation targets.
+
 Mon Apr  3 11:01:16 2006  Ben Pfaff  <address@hidden>
 
        * automake.mk: (pkgsysconf_DATA) Add AFM files in config/psfonts.
Index: pspp/config/automake.mk
diff -u pspp/config/automake.mk:1.2 pspp/config/automake.mk:1.3
--- pspp/config/automake.mk:1.2 Mon Apr  3 20:07:54 2006
+++ pspp/config/automake.mk     Wed Apr  5 03:21:07 2006
@@ -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 @@
        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