From eb2feeb50b874b2643004e1b65011b662f2f469f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 5 Apr 2006 03:21:07 +0000 Subject: [PATCH] Fix bugs in installation targets. --- config/ChangeLog | 4 ++++ config/automake.mk | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 57301e52..292a289f 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +Tue Apr 4 20:20:49 2006 Ben Pfaff + + * automake.mk: Fix bugs in installation targets. + Mon Apr 3 11:01:16 2006 Ben Pfaff * automake.mk: (pkgsysconf_DATA) Add AFM files in config/psfonts. diff --git a/config/automake.mk b/config/automake.mk index a6e4697c..c0b2343b 100644 --- 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 -- 2.30.2