00dani/stow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix automake issues (thanks to Stefano Lattarini for spotting these!)

Browse source
This commit is contained in:
Adam Spiers 2011-12-06 16:20:52 +00:00
parent d1073789d2
commit bbaace4d5a
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Build.PL
View file

@ -49,7 +49,7 @@ my $build = Module::Build->new(
'IO::File' => 0, 'IO::File' => 0,
}, },
script_files => [ 'bin/stow' ], script_files => [ 'bin/stow' ],
all_from => 'lib/Stow.pm', all_from => 'lib/Stow.pm.in',
configure_requires => { configure_requires => {
'Module::Build' => 0, 'Module::Build' => 0,
}, },

21
Makefile.am
View file

@ -1,6 +1,6 @@
## Process this file with Automake to produce Makefile.in ## 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 info_TEXINFOS = doc/stow.texi
dist_man_MANS = doc/stow.8 dist_man_MANS = doc/stow.8
PDF = doc/manual.pdf PDF = doc/manual.pdf
@ -11,7 +11,7 @@ dist_doc_DATA = \
ChangeLog doc/ChangeLog.OLD ChangeLog doc/ChangeLog.OLD
pmdir = $(PMDIR) pmdir = $(PMDIR)
dist_pm_DATA = lib/Stow.pm pm_DATA = lib/Stow.pm
pmstowdir = $(pmdir)/Stow pmstowdir = $(pmdir)/Stow
dist_pmstow_DATA = lib/Stow/Util.pm dist_pmstow_DATA = lib/Stow/Util.pm
@ -35,7 +35,7 @@ DEFAULT_IGNORE_LIST = $(srcdir)/default-ignore-list
TESTS_DIR = $(srcdir)/t TESTS_DIR = $(srcdir)/t
TESTS_OUT = tmp-testing-trees 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 # 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 # `check-am' target makes check-TESTS, but we override check-TESTS
@ -81,13 +81,14 @@ EXTRA_DIST = \
$(TEXINFO_TEX) \ $(TEXINFO_TEX) \
$(DEFAULT_IGNORE_LIST) \ $(DEFAULT_IGNORE_LIST) \
$(CPAN_FILES) $(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 up auto-generated files
clean-local: clean-local:
-rm -rf $(TESTS_OUT) \ -rm -rf $(TESTS_OUT)
bin/stow bin/chkstow doc/stow.8 ChangeLog \ maintainer-clean:
doc/manual-split $(HTML) $(PDF) -rm -rf doc/manual-split
# this is more explicit and reliable than the config file trick # this is more explicit and reliable than the config file trick
edit = sed -e 's|[@]PERL[@]|$(PERL)|g' \ 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. # 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 [ -d doc ] || mkdir doc # required in vpath mode
pod2man $< > $@ pod2man $< > $@
@ -178,7 +179,9 @@ $(HTML): doc/manual-split
# keep in anyway: # keep in anyway:
dist-hook: doc/manual-split dist-hook: doc/manual-split
ChangeLog: doc/ChangeLog.OLD Makefile dist-hook: $(dist_man_MANS) ChangeLog
ChangeLog: doc/ChangeLog.OLD
@if [ -d .git ]; then \ @if [ -d .git ]; then \
( \ ( \
git log \ git log \

1
NEWS
View file

@ -3,6 +3,7 @@ News file for Stow.
* Changes in version 2.1.1 * Changes in version 2.1.1
** Fixed bug where ./configure --with-pmdir=X was ineffectual. ** Fixed bug where ./configure --with-pmdir=X was ineffectual.
** Calculated the correct default value for pmdir based on the local Perl installation. ** 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 * Changes in version 2.1.0
** Major refactoring of code into separate Stow and Stow::Util Perl modules. ** Major refactoring of code into separate Stow and Stow::Util Perl modules.
** Added support for ignore list files. ** Added support for ignore list files.

1
THANKS
View file

@ -21,3 +21,4 @@ Emil Mikulic <emil.mikulic@rmit.edu.au>
Austin Wood <austin.wood@rmit.edu.au> Austin Wood <austin.wood@rmit.edu.au>
Christopher Hoobin <christopher.hoobin.edu.au> Christopher Hoobin <christopher.hoobin.edu.au>
Adam Spiers <stow@adamspiers.org> Adam Spiers <stow@adamspiers.org>
Stefano Lattarini