diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rwxr-xr-x | doc/lcov-inject.pl (renamed from doc/lcov-inject) | 2 | ||||
| -rw-r--r-- | dselect/methods/Makefile.am | 27 | ||||
| -rw-r--r-- | dselect/methods/ftp/.gitignore | 3 | ||||
| -rwxr-xr-x | dselect/methods/ftp/install.pl (renamed from dselect/methods/ftp/install) | 0 | ||||
| -rwxr-xr-x | dselect/methods/ftp/setup.pl (renamed from dselect/methods/ftp/setup) | 0 | ||||
| -rwxr-xr-x | dselect/methods/ftp/update.pl (renamed from dselect/methods/ftp/update) | 0 |
7 files changed, 29 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index aa132700a..2d98f4911 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ EXTRA_DIST = \ doc/README.feature-removal-schedule \ doc/coding-style.txt \ doc/frontend.txt \ - doc/lcov-inject \ + doc/lcov-inject.pl \ doc/triggers.txt \ debian/changelog \ debian/compat \ @@ -98,7 +98,7 @@ LCOV_CAPTURE_OPTS = $(LCOV_OPTS) --no-recursion \ -d $(top_builddir)/lib/dpkg \ -d $(top_builddir)/src \ -d $(top_builddir)/utils -LCOV_INJECT = $(PERL) -i $(top_srcdir)/doc/lcov-inject +LCOV_INJECT = $(PERL) -i $(top_srcdir)/doc/lcov-inject.pl coverage: all : # Remove coverage data from any previous run diff --git a/doc/lcov-inject b/doc/lcov-inject.pl index eda121d5a..5ba8e4468 100755 --- a/doc/lcov-inject +++ b/doc/lcov-inject.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# lcov-inject +# lcov-inject.pl # # Copyright © 2014 Guillem Jover <guillem@debian.org> # diff --git a/dselect/methods/Makefile.am b/dselect/methods/Makefile.am index 1f916bb8e..3272115eb 100644 --- a/dselect/methods/Makefile.am +++ b/dselect/methods/Makefile.am @@ -18,6 +18,12 @@ nobase_dist_methods_DATA = \ multicd/desc.multi_mount \ multicd/desc.multi_nfs +nobase_methods_SCRIPTS = \ + ftp/setup \ + ftp/update \ + ftp/install \ + $(nil) + nobase_dist_methods_SCRIPTS = \ disk/setup \ disk/update \ @@ -25,9 +31,6 @@ nobase_dist_methods_SCRIPTS = \ floppy/setup \ floppy/update \ floppy/install \ - ftp/setup \ - ftp/update \ - ftp/install \ multicd/setup \ multicd/update \ multicd/install @@ -35,7 +38,23 @@ nobase_dist_methods_SCRIPTS = \ perllibdir = $(PERL_LIBDIR) nobase_dist_perllib_DATA = Dselect/Ftp.pm -EXTRA_DIST = multicd/README.multicd +EXTRA_DIST = \ + ftp/setup.pl \ + ftp/update.pl \ + ftp/install.pl \ + multicd/README.multicd + +CLEANFILES = \ + $(nobase_methods_SCRIPTS) \ + $(nil) + +do_perl_subst = $(AM_V_GEN) \ + sed -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):" + +%: %.pl Makefile + @test -d `dirname $@` || $(MKDIR_P) `dirname $@` + $(do_perl_subst) <$< >$@ + $(AM_V_at) chmod +x $@ install-data-local: $(MKDIR_P) $(DESTDIR)$(admindir)/methods/mnt diff --git a/dselect/methods/ftp/.gitignore b/dselect/methods/ftp/.gitignore new file mode 100644 index 000000000..0eb5327ca --- /dev/null +++ b/dselect/methods/ftp/.gitignore @@ -0,0 +1,3 @@ +install +setup +update diff --git a/dselect/methods/ftp/install b/dselect/methods/ftp/install.pl index c217fa95d..c217fa95d 100755 --- a/dselect/methods/ftp/install +++ b/dselect/methods/ftp/install.pl diff --git a/dselect/methods/ftp/setup b/dselect/methods/ftp/setup.pl index f9170ef77..f9170ef77 100755 --- a/dselect/methods/ftp/setup +++ b/dselect/methods/ftp/setup.pl diff --git a/dselect/methods/ftp/update b/dselect/methods/ftp/update.pl index e1cc0b770..e1cc0b770 100755 --- a/dselect/methods/ftp/update +++ b/dselect/methods/ftp/update.pl |