From 60d46c352087c38c29a690d80b62441028579f35 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Fri, 6 Apr 2001 10:09:39 +0000 Subject: [PATCH] Get the install paths from configure. --- CHANGES | 5 ++++- MCONFIG.in | 6 ++++-- configure | 2 +- configure.in | 2 +- dump.spec | 2 +- dump/Makefile.in | 13 +++++++------ restore/Makefile.in | 13 +++++++------ rmt/Makefile.in | 5 +++-- 8 files changed, 28 insertions(+), 20 deletions(-) diff --git a/CHANGES b/CHANGES index 8710d0b..942238c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -$Id: CHANGES,v 1.107 2001/03/20 09:14:57 stelian Exp $ +$Id: CHANGES,v 1.108 2001/04/06 10:09:39 stelian Exp $ Changes between versions 0.4b21 and 0.4b22 (released ????????????????) ====================================================================== @@ -30,6 +30,9 @@ Changes between versions 0.4b21 and 0.4b22 (released ????????????????) ext2fs COMPAT flags, time_t cleanups, added libext2 version in dump usage text) by Andreas Dilger . +6. Made --prefix option work in configure. All the install path + are now based on the configure parameters. + Changes between versions 0.4b20 and 0.4b21 (released January 13, 2001) ====================================================================== diff --git a/MCONFIG.in b/MCONFIG.in index 200d402..ec8c3dc 100644 --- a/MCONFIG.in +++ b/MCONFIG.in @@ -24,8 +24,10 @@ MANMODE= @MANMODE@ INSTALLBIN= $(INSTALL) -o $(BINOWNER) -g $(BINGRP) -m $(BINMODE) INSTALLMAN= $(INSTALL) -o $(MANOWNER) -g $(MANGRP) -m $(MANMODE) -BINDIR= /sbin -MANDIR= /usr/man/man8 +prefix= @prefix@ +exec_prefix= @exec_prefix@ +SBINDIR= @sbindir@ +MANDIR= @mandir@/man8 DUMPDATESPATH= @DUMPDATESPATH@ # diff --git a/configure b/configure index 738d982..7b7fc23 100755 --- a/configure +++ b/configure @@ -1532,7 +1532,7 @@ if test "${with_dumpdatespath+set}" = set; then echo "$ac_t""DUMPDATESPATH is $withval" 1>&6 DUMPDATESPATH=$withval else - DUMPDATESPATH="/etc/dumpdates" + DUMPDATESPATH="${sysconfdir}/dumpdates" echo "DUMPDATESPATH defaults to $DUMPDATESPATH" fi diff --git a/configure.in b/configure.in index 8769174..6f8e57b 100644 --- a/configure.in +++ b/configure.in @@ -259,7 +259,7 @@ AC_ARG_WITH([dumpdatespath], [ --with-dumpdatespath=PATH select path for dumpdates file], AC_MSG_RESULT(DUMPDATESPATH is $withval) DUMPDATESPATH=$withval, -DUMPDATESPATH="/etc/dumpdates" +DUMPDATESPATH="${sysconfdir}/dumpdates" echo "DUMPDATESPATH defaults to $DUMPDATESPATH" )dnl AC_SUBST(DUMPDATESPATH) diff --git a/dump.spec b/dump.spec index 539bcc9..aecb5dd 100644 --- a/dump.spec +++ b/dump.spec @@ -73,7 +73,7 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_mandir}/man8 -%makeinstall BINDIR=%{buildroot}%{_sbindir} MANDIR=%{buildroot}%{_mandir}/man8 BINOWNER=$(id -un) BINGRP=$(id -gn) MANOWNER=$(id -un) MANGRP=$(id -gn) +%makeinstall SBINDIR=%{buildroot}%{_sbindir} MANDIR=%{buildroot}%{_mandir}/man8 BINOWNER=$(id -un) BINGRP=$(id -gn) MANOWNER=$(id -un) MANGRP=$(id -gn) cp dump/dump.static %{buildroot}%{_sbindir} cp restore/restore.static %{buildroot}%{_sbindir} diff --git a/dump/Makefile.in b/dump/Makefile.in index 06925e9..555d3db 100644 --- a/dump/Makefile.in +++ b/dump/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.5 2001/02/21 16:13:05 stelian Exp $ +# $Id: Makefile.in,v 1.6 2001/04/06 10:09:40 stelian Exp $ top_srcdir= @top_srcdir@ srcdir= @srcdir@ @@ -11,12 +11,12 @@ LIBS= $(GLIBS) @ZLIB@ DEPLIBS= ../compat/lib/libcompat.a PROG= dump -LINKS= ${BINDIR}/dump ${BINDIR}/rdump +LINKS= ${SBINDIR}/dump ${SBINDIR}/rdump SRCS= itime.c main.c optr.c tape.c traverse.c unctime.c OBJS= itime.o main.o optr.o tape.o traverse.o unctime.o \ ../common/dumprmt.o MAN8= dump.8 -MLINKS= dump.8 $(MANDIR)/rdump.8 +MLINKS= $(MANDIR)/dump.8 $(MANDIR)/rdump.8 all:: $(PROG) dump.8 @@ -29,13 +29,14 @@ dump.8: dump.8.in -e "s|__VERSION__|$(VERSION)|g" $< > $@ install:: all - $(INSTALLBIN) $(PROG) $(BINDIR) + $(INSTALL) -d $(SBINDIR) $(MANDIR) + $(INSTALLBIN) $(PROG) $(SBINDIR) $(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR) @set $(LINKS) $(MLINKS); \ while test $$# -ge 2; do \ - l=$(DESTDIR)$$1; \ + l=$$1; \ shift; \ - t=$(DESTDIR)$$1; \ + t=$$1; \ shift; \ echo $$t -\> $$l; \ $(RM) -f $$t; \ diff --git a/restore/Makefile.in b/restore/Makefile.in index af0b593..397302f 100644 --- a/restore/Makefile.in +++ b/restore/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.6 2001/02/21 16:13:05 stelian Exp $ +# $Id: Makefile.in,v 1.7 2001/04/06 10:09:40 stelian Exp $ top_srcdir= @top_srcdir@ srcdir= @srcdir@ @@ -11,13 +11,13 @@ LIBS= $(GLIBS) -le2p @READLINE@ @ZLIB@ DEPLIBS= ../compat/lib/libcompat.a PROG= restore -LINKS= ${BINDIR}/restore ${BINDIR}/rrestore +LINKS= ${SBINDIR}/restore ${SBINDIR}/rrestore SRCS= dirs.c interactive.c main.c restore.c symtab.c tape.c \ utilities.c OBJS= dirs.o interactive.o main.o restore.o symtab.o tape.o \ utilities.o ../common/dumprmt.o MAN8= restore.8 -MLINKS= restore.8 $(MANDIR)/rrestore.8 +MLINKS= $(MANDIR)/restore.8 $(MANDIR)/rrestore.8 all:: $(PROG) restore.8 @@ -29,13 +29,14 @@ restore.8: restore.8.in -e "s|__VERSION__|$(VERSION)|g" $< > $@ install:: all - $(INSTALLBIN) $(PROG) $(BINDIR) + $(INSTALL) -d $(SBINDIR) $(MANDIR) + $(INSTALLBIN) $(PROG) $(SBINDIR) $(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR) @set $(LINKS) $(MLINKS); \ while test $$# -ge 2; do \ - l=$(DESTDIR)$$1; \ + l=$$1; \ shift; \ - t=$(DESTDIR)$$1; \ + t=$$1; \ shift; \ echo $$t -\> $$l; \ $(RM) -f $$t; \ diff --git a/rmt/Makefile.in b/rmt/Makefile.in index e098302..b3a0a4b 100644 --- a/rmt/Makefile.in +++ b/rmt/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.4 1999/10/11 13:31:14 stelian Exp $ +# $Id: Makefile.in,v 1.5 2001/04/06 10:09:40 stelian Exp $ top_srcdir= @top_srcdir@ srcdir= @srcdir@ @@ -30,7 +30,8 @@ rmt.8: rmt.8.in -e "s|__VERSION__|$(VERSION)|g" $< > $@ install:: all - $(INSTALLBIN) $(PROG) $(BINDIR) + $(INSTALL) -d $(SBINDIR) $(MANDIR) + $(INSTALLBIN) $(PROG) $(SBINDIR) $(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR) clean:: -- 2.39.5