From dbe7cae189fe53d44e49048fdb2c10e5436f0959 Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Sat, 18 Jun 2016 20:10:24 -0700 Subject: [PATCH] Rename 'install' dir to 'installer' so it doesn't confuse make dist, and include it in the make dist bundle. --- Makefile.am | 4 ++-- Makefile.in | 4 ++-- {install => installer}/install.cfg | 0 {install => installer}/install.sh | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename {install => installer}/install.cfg (100%) rename {install => installer}/install.sh (100%) diff --git a/Makefile.am b/Makefile.am index 6d1c8eb..a555745 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ AUTOMAKE_OPTIONS = foreign no-dependencies SUBDIRS = man src -EXTRA_DIST = COMMERCIAL MAINTAINERS TRADEMARK LICENSE Packaging README-2.4.3 README.md autogen.sh autogen.sh.README touchconfig.sh contrib policy +EXTRA_DIST = COMMERCIAL MAINTAINERS TRADEMARK LICENSE Packaging README-2.4.3 README.md autogen.sh autogen.sh.README touchconfig.sh contrib policy installer install-data-hook: prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \ - ./install/install.sh + ./installer/install.sh diff --git a/Makefile.in b/Makefile.in index 79fbad4..c8e58aa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -321,7 +321,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies SUBDIRS = man src -EXTRA_DIST = COMMERCIAL MAINTAINERS TRADEMARK LICENSE Packaging README-2.4.3 README.md autogen.sh autogen.sh.README touchconfig.sh contrib policy +EXTRA_DIST = COMMERCIAL MAINTAINERS TRADEMARK LICENSE Packaging README-2.4.3 README.md autogen.sh autogen.sh.README touchconfig.sh contrib policy installer all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -799,7 +799,7 @@ uninstall-am: install-data-hook: prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \ - ./install/install.sh + ./installer/install.sh # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/install/install.cfg b/installer/install.cfg similarity index 100% rename from install/install.cfg rename to installer/install.cfg diff --git a/install/install.sh b/installer/install.sh similarity index 100% rename from install/install.sh rename to installer/install.sh