From 58dafd1d9ed9e57a0ebe50d016418f378a4d5572 Mon Sep 17 00:00:00 2001 From: brc0x1 Date: Mon, 13 Mar 2017 17:25:44 -0700 Subject: [PATCH] Tweak path to install.sh so 'make distcheck' works; update installer to pick up additional files for docs directory. --- Makefile.am | 2 +- Makefile.in | 2 +- installer/install.sh | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 871e373..097fe7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ install-data-hook: export INSTALL_STRIP_FLAG prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \ - ./installer/install.sh + $(top_srcdir)/installer/install.sh uninstall-hook: rm -f ${prefix}/sbin/tripwire $(prefix)/sbin/twadmin $(prefix)/sbin/twprint $(prefix)/sbin/siggen diff --git a/Makefile.in b/Makefile.in index 5c041f2..4c462b6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -802,7 +802,7 @@ install-data-hook: export INSTALL_STRIP_FLAG prefix="$(prefix)" sysconfdir="$(sysconfdir)" \ path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \ - ./installer/install.sh + $(top_srcdir)/installer/install.sh uninstall-hook: rm -f ${prefix}/sbin/tripwire $(prefix)/sbin/twadmin $(prefix)/sbin/twprint $(prefix)/sbin/siggen diff --git a/installer/install.sh b/installer/install.sh index de14eff..fbd26c8 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -584,9 +584,12 @@ f10=' ff=${POLICYSRC} ; d="/policy" ; dd=$TWPOLICY ; rr=0640 ' #f16=' ff=twadmin.8 ; d="/man/man8" ; dd=$TWMAN/man8 ; rr=0444 ' #f17=' ff=twintro.8 ; d="/man/man8" ; dd=$TWMAN/man8 ; rr=0444 ' #f18=' ff=twprint.8 ; d="/man/man8" ; dd=$TWMAN/man8 ; rr=0444 ' +f19=' ff=COMMERCIAL ; d="" ; dd=$TWDOCS ; rr=0444 ' +f20=' ff=ReadMe-2.4.3 ; d="" ; dd=$TWDOCS ; rr=0444 ' +f21=' ff=ChangeLog ; d="" ; dd=$TWDOCS ; rr=0444 ' # Binaries and manpages are already installed by the install target -loosefiles="f3 f4 f5 f6 f7 f8 f9 f10" +loosefiles="f3 f4 f5 f6 f7 f8 f9 f10 f19 f20 f21" for i in $loosefiles; do eval "eval \"\$$i\""