X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=config%2Fautomake.mk;fp=config%2Fautomake.mk;h=c0b2343b192bdb8058cbcac07c94256bfecf71e1;hb=eb2feeb50b874b2643004e1b65011b662f2f469f;hp=a6e4697c5c3300807c36494c706ea0ba3eb49bcf;hpb=70d3405f70388b3d9f15876c93a6f55944d6a961;p=pspp

diff --git a/config/automake.mk b/config/automake.mk
index a6e4697c5c..c0b2343b19 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