From bbaace4d5adb2adf30f7f80a57da3333c1b07017 Mon Sep 17 00:00:00 2001
From: Adam Spiers <stow@adamspiers.org>
Date: Tue, 6 Dec 2011 16:20:52 +0000
Subject: [PATCH] Fix automake issues (thanks to Stefano Lattarini for spotting
 these!)

---
 Build.PL    |  2 +-
 Makefile.am | 21 ++++++++++++---------
 NEWS        |  1 +
 THANKS      |  1 +
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Build.PL b/Build.PL
index 255bc5e..c9aef1f 100644
--- a/Build.PL
+++ b/Build.PL
@@ -49,7 +49,7 @@ my $build = Module::Build->new(
         'IO::File'    => 0,
     },
     script_files => [ 'bin/stow' ],
-    all_from => 'lib/Stow.pm',
+    all_from => 'lib/Stow.pm.in',
     configure_requires => {
         'Module::Build' => 0,
     },
diff --git a/Makefile.am b/Makefile.am
index b8af445..38509e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with Automake to produce Makefile.in
 
-dist_bin_SCRIPTS = bin/stow bin/chkstow
+bin_SCRIPTS = bin/stow bin/chkstow
 info_TEXINFOS = doc/stow.texi
 dist_man_MANS = doc/stow.8
 PDF = doc/manual.pdf
@@ -11,7 +11,7 @@ dist_doc_DATA = \
 	ChangeLog doc/ChangeLog.OLD
 
 pmdir = $(PMDIR)
-dist_pm_DATA = lib/Stow.pm
+pm_DATA = lib/Stow.pm
 pmstowdir = $(pmdir)/Stow
 dist_pmstow_DATA = lib/Stow/Util.pm
 
@@ -35,7 +35,7 @@ DEFAULT_IGNORE_LIST = $(srcdir)/default-ignore-list
 
 TESTS_DIR = $(srcdir)/t
 TESTS_OUT = tmp-testing-trees
-TESTS_ENVIRONMENT = $(PERL) -I$(srcdir)/bin -I$(srcdir)/lib -I$(TESTS_DIR)
+TESTS_ENVIRONMENT = $(PERL) -Ibin -Ilib -I$(TESTS_DIR)
 
 # This is a kind of hack; TESTS needs to be set to ensure that the
 # `check-am' target makes check-TESTS, but we override check-TESTS
@@ -81,13 +81,14 @@ EXTRA_DIST = \
 	$(TEXINFO_TEX) \
 	$(DEFAULT_IGNORE_LIST) \
 	$(CPAN_FILES)
-CLEANFILES = $(bin_SCRIPTS) $(dist_pm_DATA)
+CLEANFILES = $(bin_SCRIPTS) $(pm_DATA) $(dist_man_MANS) $(HTML) $(PDF) ChangeLog
+
 
 # clean up auto-generated files
 clean-local:
-	-rm -rf $(TESTS_OUT) \
-		bin/stow bin/chkstow doc/stow.8 ChangeLog \
-		doc/manual-split $(HTML) $(PDF)
+	-rm -rf $(TESTS_OUT)
+maintainer-clean:
+	-rm -rf doc/manual-split
 
 # this is more explicit and reliable than the config file trick
 edit = sed -e 's|[@]PERL[@]|$(PERL)|g' \
@@ -111,7 +112,7 @@ lib/Stow.pm: lib/Stow.pm.in Makefile $(DEFAULT_IGNORE_LIST)
 # The below rules should only be needed by developers.
 ##############################################################################
 
-doc/stow.8: bin/stow Makefile
+doc/stow.8: bin/stow.in
 	[ -d doc ] || mkdir doc # required in vpath mode
 	pod2man $< > $@
 
@@ -178,7 +179,9 @@ $(HTML): doc/manual-split
 # keep in anyway:
 dist-hook: doc/manual-split
 
-ChangeLog: doc/ChangeLog.OLD Makefile
+dist-hook: $(dist_man_MANS) ChangeLog
+
+ChangeLog: doc/ChangeLog.OLD
 	@if [ -d .git ]; then \
 	    ( \
 	        git log \
diff --git a/NEWS b/NEWS
index 9e2bc34..52c368c 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ News file for Stow.
 * Changes in version 2.1.1
 ** Fixed bug where ./configure --with-pmdir=X was ineffectual.
 ** Calculated the correct default value for pmdir based on the local Perl installation.
+** Fixed some automake issues (thanks to Stefano Lattarini for spotting these!)
 * Changes in version 2.1.0
 ** Major refactoring of code into separate Stow and Stow::Util Perl modules.
 ** Added support for ignore list files.
diff --git a/THANKS b/THANKS
index f40e883..cc2f3d7 100644
--- a/THANKS
+++ b/THANKS
@@ -21,3 +21,4 @@ Emil Mikulic        <emil.mikulic@rmit.edu.au>
 Austin Wood         <austin.wood@rmit.edu.au>
 Christopher Hoobin  <christopher.hoobin.edu.au>
 Adam Spiers         <stow@adamspiers.org>
+Stefano Lattarini