From 86baf94ddfbe85e41c24116d00efca47b26daae4 Mon Sep 17 00:00:00 2001 From: brc0x1 Date: Mon, 20 Feb 2017 17:03:24 -0800 Subject: [PATCH] Fix man page handling in make install --- Makefile.in | 1 + configure | 14 +++++++++++++- man/Makefile.in | 1 + man/man4/Makefile.am | 3 +-- man/man4/Makefile.in | 10 +++++----- man/man5/Makefile.am | 3 +-- man/man5/Makefile.in | 10 +++++----- man/man8/Makefile.am | 3 +-- man/man8/Makefile.in | 10 +++++----- src/Makefile.am | 3 +++ src/Makefile.in | 5 ++++- src/core/Makefile.in | 1 + src/cryptlib/Makefile.in | 1 + src/db/Makefile.in | 1 + src/fco/Makefile.in | 1 + src/fs/Makefile.in | 1 + src/siggen/Makefile.in | 1 + src/tripwire/Makefile.in | 1 + src/tw/Makefile.in | 1 + src/twadmin/Makefile.in | 1 + src/twcrypto/Makefile.in | 1 + src/twparser/Makefile.in | 1 + src/twprint/Makefile.in | 1 + src/twtest/Makefile.in | 1 + src/util/Makefile.in | 1 + 25 files changed, 54 insertions(+), 23 deletions(-) diff --git a/Makefile.in b/Makefile.in index c8e58aa..0c17953 100644 --- a/Makefile.in +++ b/Makefile.in @@ -307,6 +307,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/configure b/configure index d32e23b..1dca42e 100755 --- a/configure +++ b/configure @@ -724,6 +724,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -808,6 +809,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1060,6 +1062,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1197,7 +1208,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1350,6 +1361,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/man/Makefile.in b/man/Makefile.in index ffd3622..9cf2615 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -284,6 +284,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/man/man4/Makefile.am b/man/man4/Makefile.am index 3ee9884..7ea2fb8 100644 --- a/man/man4/Makefile.am +++ b/man/man4/Makefile.am @@ -1,3 +1,2 @@ AUTOMAKE_OPTIONS = foreign no-dependencies -man_MANS = twconfig.4 twpolicy.4 -dist_man_MANS = twconfig.4 twpolicy.4 \ No newline at end of file +dist_man_MANS = twconfig.4 twpolicy.4 diff --git a/man/man4/Makefile.in b/man/man4/Makefile.in index 2d5c2f9..01437ef 100644 --- a/man/man4/Makefile.in +++ b/man/man4/Makefile.in @@ -150,7 +150,7 @@ am__uninstall_files_from_dir = { \ man4dir = $(mandir)/man4 am__installdirs = "$(DESTDIR)$(man4dir)" NROFF = nroff -MANS = $(dist_man_MANS) $(man_MANS) +MANS = $(dist_man_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ $(top_srcdir)/mkinstalldirs @@ -256,6 +256,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -269,7 +270,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies -man_MANS = twconfig.4 twpolicy.4 dist_man_MANS = twconfig.4 twpolicy.4 all: all-am @@ -303,10 +303,10 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-man4: $(dist_man_MANS) $(man_MANS) +install-man4: $(dist_man_MANS) @$(NORMAL_INSTALL) @list1=''; \ - list2='$(dist_man_MANS) $(man_MANS)'; \ + list2='$(dist_man_MANS)'; \ test -n "$(man4dir)" \ && test -n "`echo $$list1$$list2`" \ || exit 0; \ @@ -341,7 +341,7 @@ uninstall-man4: @$(NORMAL_UNINSTALL) @list=''; test -n "$(man4dir)" || exit 0; \ files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ sed -n '/\.4[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^4][0-9a-z]*$$,4,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am index 09a087d..3c6716b 100644 --- a/man/man5/Makefile.am +++ b/man/man5/Makefile.am @@ -1,3 +1,2 @@ AUTOMAKE_OPTIONS = foreign no-dependencies -man_MANS = twfiles.5 -dist_man_MANS = twfiles.5 \ No newline at end of file +dist_man_MANS = twfiles.5 diff --git a/man/man5/Makefile.in b/man/man5/Makefile.in index bf744fb..9bb9a4d 100644 --- a/man/man5/Makefile.in +++ b/man/man5/Makefile.in @@ -150,7 +150,7 @@ am__uninstall_files_from_dir = { \ man5dir = $(mandir)/man5 am__installdirs = "$(DESTDIR)$(man5dir)" NROFF = nroff -MANS = $(dist_man_MANS) $(man_MANS) +MANS = $(dist_man_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ $(top_srcdir)/mkinstalldirs @@ -256,6 +256,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -269,7 +270,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies -man_MANS = twfiles.5 dist_man_MANS = twfiles.5 all: all-am @@ -303,10 +303,10 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-man5: $(dist_man_MANS) $(man_MANS) +install-man5: $(dist_man_MANS) @$(NORMAL_INSTALL) @list1=''; \ - list2='$(dist_man_MANS) $(man_MANS)'; \ + list2='$(dist_man_MANS)'; \ test -n "$(man5dir)" \ && test -n "`echo $$list1$$list2`" \ || exit 0; \ @@ -341,7 +341,7 @@ uninstall-man5: @$(NORMAL_UNINSTALL) @list=''; test -n "$(man5dir)" || exit 0; \ files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ sed -n '/\.5[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am index cf05479..a3d568b 100644 --- a/man/man8/Makefile.am +++ b/man/man8/Makefile.am @@ -1,3 +1,2 @@ AUTOMAKE_OPTIONS = foreign no-dependencies -man_MANS = siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8 -dist_man_MANS = siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8 \ No newline at end of file +dist_man_MANS = siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8 diff --git a/man/man8/Makefile.in b/man/man8/Makefile.in index 4d628ae..9341d22 100644 --- a/man/man8/Makefile.in +++ b/man/man8/Makefile.in @@ -150,7 +150,7 @@ am__uninstall_files_from_dir = { \ man8dir = $(mandir)/man8 am__installdirs = "$(DESTDIR)$(man8dir)" NROFF = nroff -MANS = $(dist_man_MANS) $(man_MANS) +MANS = $(dist_man_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ $(top_srcdir)/mkinstalldirs @@ -256,6 +256,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -269,7 +270,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies -man_MANS = siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8 dist_man_MANS = siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8 all: all-am @@ -303,10 +303,10 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-man8: $(dist_man_MANS) $(man_MANS) +install-man8: $(dist_man_MANS) @$(NORMAL_INSTALL) @list1=''; \ - list2='$(dist_man_MANS) $(man_MANS)'; \ + list2='$(dist_man_MANS)'; \ test -n "$(man8dir)" \ && test -n "`echo $$list1$$list2`" \ || exit 0; \ @@ -341,7 +341,7 @@ uninstall-man8: @$(NORMAL_UNINSTALL) @list=''; test -n "$(man8dir)" || exit 0; \ files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ sed -n '/\.8[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ diff --git a/src/Makefile.am b/src/Makefile.am index f8e10cf..d795672 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,3 +2,6 @@ SUBDIRS = cryptlib core db fco fs tw twcrypto twparser util SUBDIRS+= twprint twadmin siggen tripwire twtest EXTRA_DIST = buildnum.h buildnum.txt buildnuminc.pl dep_addprefix.pl rmcr.pl check_st.pl prime.pl parser test-harness core/md5.cpp core/sha.cpp +install: + /bin/true + diff --git a/src/Makefile.in b/src/Makefile.in index c5e1faa..1914aca 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -282,6 +282,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -489,7 +490,6 @@ check: check-recursive all-am: Makefile installdirs: installdirs-recursive installdirs-am: -install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -602,6 +602,9 @@ uninstall-am: .PRECIOUS: Makefile +install: + /bin/true + # 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. .NOEXPORT: diff --git a/src/core/Makefile.in b/src/core/Makefile.in index e56f419..b838a07 100644 --- a/src/core/Makefile.in +++ b/src/core/Makefile.in @@ -314,6 +314,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/cryptlib/Makefile.in b/src/cryptlib/Makefile.in index d09773a..84de4fb 100644 --- a/src/cryptlib/Makefile.in +++ b/src/cryptlib/Makefile.in @@ -303,6 +303,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/db/Makefile.in b/src/db/Makefile.in index 4458f4a..f80ab34 100644 --- a/src/db/Makefile.in +++ b/src/db/Makefile.in @@ -300,6 +300,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/fco/Makefile.in b/src/fco/Makefile.in index 7065828..cb15522 100644 --- a/src/fco/Makefile.in +++ b/src/fco/Makefile.in @@ -308,6 +308,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in index 15eacf0..2734d23 100644 --- a/src/fs/Makefile.in +++ b/src/fs/Makefile.in @@ -303,6 +303,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/siggen/Makefile.in b/src/siggen/Makefile.in index dac8497..05165fb 100644 --- a/src/siggen/Makefile.in +++ b/src/siggen/Makefile.in @@ -295,6 +295,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/tripwire/Makefile.in b/src/tripwire/Makefile.in index 8ec0412..24a68bf 100644 --- a/src/tripwire/Makefile.in +++ b/src/tripwire/Makefile.in @@ -299,6 +299,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/tw/Makefile.in b/src/tw/Makefile.in index 641bad0..bac6b09 100644 --- a/src/tw/Makefile.in +++ b/src/tw/Makefile.in @@ -306,6 +306,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/twadmin/Makefile.in b/src/twadmin/Makefile.in index 1e1bbf9..7130f57 100644 --- a/src/twadmin/Makefile.in +++ b/src/twadmin/Makefile.in @@ -295,6 +295,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/twcrypto/Makefile.in b/src/twcrypto/Makefile.in index e34e90f..c4e40df 100644 --- a/src/twcrypto/Makefile.in +++ b/src/twcrypto/Makefile.in @@ -301,6 +301,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/twparser/Makefile.in b/src/twparser/Makefile.in index d793002..fd23dd2 100644 --- a/src/twparser/Makefile.in +++ b/src/twparser/Makefile.in @@ -302,6 +302,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/twprint/Makefile.in b/src/twprint/Makefile.in index 852d5f7..5a5ae62 100644 --- a/src/twprint/Makefile.in +++ b/src/twprint/Makefile.in @@ -295,6 +295,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/twtest/Makefile.in b/src/twtest/Makefile.in index ca9c7e7..69befaf 100644 --- a/src/twtest/Makefile.in +++ b/src/twtest/Makefile.in @@ -335,6 +335,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 0559ab8..f2a7741 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -300,6 +300,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@