centralize prefix var setting

diff --git a/automake.in b/automake.in
index 2deb9e9ab9763d148a0e984ac7120b5ff085b46e..b4f400afa5c8d6bc6e8aa3c7ead7287ce4796f87 100755 (executable)
--- 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 e153648df0af6ab16f13c28e47c376b1587ddf88..470cde158f43a36b9220041c389761dd3702b611 100644 (file)
--- 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 e153648df0af6ab16f13c28e47c376b1587ddf88..470cde158f43a36b9220041c389761dd3702b611 100644 (file)
--- 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 e61014f2792ddf50cd2095f8aaf276be0fe703ac..d0f972316ad0dcd12c7361b2792d8d6f59fabdd3 100644 (file)
--- 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 cf8e65f356ea1bb9d5f078292dad5eebc4679ae9..fd43c279cbb50ef61006c21df838db958c03b51f 100644 (file)
--- 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 e61014f2792ddf50cd2095f8aaf276be0fe703ac..d0f972316ad0dcd12c7361b2792d8d6f59fabdd3 100644 (file)
--- 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 4e176e959ef2ed69ad5894b262a437c1e8d6d55e..59a1c0c435ce9a716a935bfebb4a75b1bc7f7837 100644 (file)
--- 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