From eb5fc858f66a2044cacd3b25792d2d7e7164ca84 Mon Sep 17 00:00:00 2001 From: "David J. MacKenzie" Date: Wed, 28 Sep 1994 14:56:25 +0000 Subject: [PATCH] centralize prefix var setting --- automake.in | 2 -- header-vars.am | 3 +++ lib/am/header-vars.am | 3 +++ lib/am/mans-vars.am | 2 -- libraries-vars.am | 2 -- mans-vars.am | 2 -- texinfos-vars.am | 1 - 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/automake.in b/automake.in index 2deb9e9..b4f400a 100755 --- a/automake.in +++ b/automake.in @@ -123,11 +123,9 @@ ${am_file}_OBJECTS = ${am_file}.${kr}o" >&4 if test -n "$PROGRAMS$LIBPROGRAMS"; then if test -n "$PROGRAMS"; then - cat $AM_DIR/programs-vars.am >&4 cat $AM_DIR/programs.am >&5 fi if test -n "$LIBPROGRAMS"; then - cat $AM_DIR/libprograms-vars.am >&4 cat $AM_DIR/libprograms.am >&5 fi for am_prog in $PROGRAMS $LIBPROGRAMS; do diff --git a/header-vars.am b/header-vars.am index e153648..470cde1 100644 --- a/header-vars.am +++ b/header-vars.am @@ -23,6 +23,9 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ +bindir = $(exec_prefix)/bin +sbindir = $(exec_prefix)/sbin +libexecdir = $(exec_prefix)/libexec datadir = $(prefix)/share sysconfdir = $(prefix)/etc sharedstatedir = $(prefix)/com diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index e153648..470cde1 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -23,6 +23,9 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ +bindir = $(exec_prefix)/bin +sbindir = $(exec_prefix)/sbin +libexecdir = $(exec_prefix)/libexec datadir = $(prefix)/share sysconfdir = $(prefix)/etc sharedstatedir = $(prefix)/com diff --git a/lib/am/mans-vars.am b/lib/am/mans-vars.am index e61014f..d0f9723 100644 --- a/lib/am/mans-vars.am +++ b/lib/am/mans-vars.am @@ -1,4 +1,2 @@ -mandir = $(prefix)/man - NROFF = nroff diff --git a/libraries-vars.am b/libraries-vars.am index cf8e65f..fd43c27 100644 --- a/libraries-vars.am +++ b/libraries-vars.am @@ -1,5 +1,3 @@ -libdir = $(exec_prefix)/lib - AR = ar RANLIB = @RANLIB@ ALLOCA = @ALLOCA@ diff --git a/mans-vars.am b/mans-vars.am index e61014f..d0f9723 100644 --- a/mans-vars.am +++ b/mans-vars.am @@ -1,4 +1,2 @@ -mandir = $(prefix)/man - NROFF = nroff diff --git a/texinfos-vars.am b/texinfos-vars.am index 4e176e9..59a1c0c 100644 --- a/texinfos-vars.am +++ b/texinfos-vars.am @@ -1,6 +1,5 @@ MAKEINFO = makeinfo TEXI2DVI = texi2dvi -infodir = $(prefix)/info TEXFILES = *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.log *.pg *.toc *.tp *.vr -- 2.7.4