summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Spiers <stow@adamspiers.org>2015-11-17 17:27:39 +0000
committerAdam Spiers <stow@adamspiers.org>2015-11-17 17:27:39 +0000
commitcc0767597e5f9e23400323b42550e4672160b3c0 (patch)
tree3f6cfea1823b4aea0ddc4110be6f3e198e13b152
parent1664be4125082ee2e56ee5586228e841d912b02c (diff)
downloadstow-cc0767597e5f9e23400323b42550e4672160b3c0.tar.gz
another attempt to fix automake config
d527094b was not the right fix - Util.pm was being installed alongside Stow.pm under $(PMDIR). This should be the correct fix.
-rw-r--r--Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index fd59c77..a5e4fff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,8 +10,12 @@ dist_doc_DATA = \
$(PDF) $(HTML) doc/version.texi \
ChangeLog doc/ChangeLog.OLD
+# automake magic to define where *_DATA files get installed:
pmdir = $(PMDIR)
-pm_DATA = lib/Stow.pm lib/Stow/Util.pm
+pmstowdir = $(pmdir)/Stow
+
+pm_DATA = lib/Stow.pm
+pmstow_DATA = lib/Stow/Util.pm
TEXINFO_TEX = doc/texinfo.tex
export TEXI2DVI_BUILD_MODE = clean
@@ -79,7 +83,7 @@ EXTRA_DIST = \
$(TEXINFO_TEX) \
$(DEFAULT_IGNORE_LIST) \
$(CPAN_FILES)
-CLEANFILES = $(bin_SCRIPTS) $(pm_DATA)
+CLEANFILES = $(bin_SCRIPTS) $(pm_DATA) $(pmstow_DATA)
MAINTAINERCLEANFILES = $(dist_man_MANS) $(HTML) $(PDF) ChangeLog
# clean up auto-generated files