From e95b2affb2821b46ed369d8a13b86ee19d670645 Mon Sep 17 00:00:00 2001
From: Stelian Pop <stelian@popies.net>
Date: Wed, 2 Jan 2002 10:13:15 +0000
Subject: [PATCH] Makefile cleanups.

---
 CHANGES             | 6 +++++-
 configure           | 6 ++++--
 configure.in        | 7 ++++---
 dump/Makefile.in    | 6 +++---
 restore/Makefile.in | 6 +++---
 rmt/Makefile.in     | 4 ++--
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index d5db34a..52c5048 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.150 2001/12/24 12:31:12 stelian Exp $
+$Id: CHANGES,v 1.151 2002/01/02 10:13:15 stelian Exp $
 
 Changes between versions 0.4b25 and 0.4b26 (released ?????????????????)
 =======================================================================
@@ -16,6 +16,10 @@ Changes between versions 0.4b25 and 0.4b26 (released ?????????????????)
 	restore some missing files on the tape. Thanks to Chris
 	Siebenmann <cks@utcc.utoronto.ca> for reporting the bug.
 
+4.	Fixed --with-ldopts configure argument passing, installing from
+	a separate object directory, makefile cleanups contributed
+	by <splite@purdue.edu>.
+
 Changes between versions 0.4b24 and 0.4b25 (released November 17, 2001)
 =======================================================================
 
diff --git a/configure b/configure
index 3e461eb..1ae6fe6 100755
--- a/configure
+++ b/configure
@@ -1486,9 +1486,10 @@ fi
 if test "${with_ldopts+set}" = set; then
   withval="$with_ldopts"
   echo "$ac_t""LDFLAGS is $withval" 1>&6
-LDFLAGS=$withval
+LDOPTS=$withval
+LDFLAGS="$LDFLAGS $withval"
 else
-  LDFLAGS=
+  LDOPTS=
 fi
 
 
@@ -2616,6 +2617,7 @@ s%@OPTDEFS@%$OPTDEFS%g
 s%@READLINE@%$READLINE%g
 s%@LD@%$LD%g
 s%@CCOPTS@%$CCOPTS%g
+s%@LDOPTS@%$LDOPTS%g
 s%@BINOWNER@%$BINOWNER%g
 s%@BINGRP@%$BINGRP%g
 s%@BINMODE@%$BINMODE%g
diff --git a/configure.in b/configure.in
index e8bc852..c681be2 100644
--- a/configure.in
+++ b/configure.in
@@ -202,9 +202,10 @@ dnl
 AC_ARG_WITH([ldopts],
 [  --with-ldopts=LDOPTS       select linker command line options],
 AC_MSG_RESULT(LDFLAGS is $withval)
-LDFLAGS=$withval,
-LDFLAGS=)dnl
-AC_SUBST(LDFLAGS)
+LDOPTS=$withval
+LDFLAGS="$LDFLAGS $withval",
+LDOPTS=)dnl
+AC_SUBST(LDOPTS)
 
 dnl
 dnl set $(BINOWNER) from --with-binowner
diff --git a/dump/Makefile.in b/dump/Makefile.in
index 52b7c15..310eb75 100644
--- a/dump/Makefile.in
+++ b/dump/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.8 2001/08/16 15:24:21 stelian Exp $
+# $Id: Makefile.in,v 1.9 2002/01/02 10:13:15 stelian Exp $
 
 top_srcdir=	@top_srcdir@
 srcdir=		@srcdir@
@@ -6,7 +6,7 @@ srcdir=		@srcdir@
 @MCONFIG@
 
 CFLAGS=		@CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS) @DUMPDEBUG@
-LDFLAGS:=	$(LDFLAGS) @STATIC@
+LDFLAGS=	@LDOPTS@ @STATIC@
 LIBS=		$(GLIBS) @ZLIB@ @BZLIB@
 DEPLIBS=	../compat/lib/libcompat.a
 
@@ -32,7 +32,7 @@ $(MAN8):	dump.8.in
 install::	all
 	$(INSTALL) -d $(SBINDIR) $(MANDIR)
 	$(INSTALLBIN) $(PROG) $(SBINDIR)
-	$(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR)
+	$(INSTALLMAN) $(MAN8) $(MANDIR)
 	cd $(SBINDIR) && $(RM) -f $(RPROG) && $(LN_S) $(PROG) $(RPROG)
 	cd $(MANDIR) && $(RM) -f $(RMAN8) && $(LN_S) $(MAN8) $(RMAN8)
 
diff --git a/restore/Makefile.in b/restore/Makefile.in
index 3f2ed45..c0babd9 100644
--- a/restore/Makefile.in
+++ b/restore/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.9 2001/08/16 15:24:21 stelian Exp $
+# $Id: Makefile.in,v 1.10 2002/01/02 10:13:16 stelian Exp $
 
 top_srcdir=	@top_srcdir@
 srcdir=		@srcdir@
@@ -6,7 +6,7 @@ srcdir=		@srcdir@
 @MCONFIG@
 
 CFLAGS=		@CCOPTS@ -pipe $(OPT) $(DEFS) $(GINC) $(INC) @RESTOREDEBUG@
-LDFLAGS:=	$(LDFLAGS) @STATIC@
+LDFLAGS=	@LDOPTS@ @STATIC@
 LIBS=		$(GLIBS) -le2p @READLINE@ @ZLIB@ @BZLIB@
 DEPLIBS=	../compat/lib/libcompat.a
 
@@ -32,7 +32,7 @@ $(MAN8):	restore.8.in
 install::	all
 	$(INSTALL) -d $(SBINDIR) $(MANDIR)
 	$(INSTALLBIN) $(PROG) $(SBINDIR)
-	$(INSTALLMAN) $(srcdir)/$(MAN8) $(MANDIR)
+	$(INSTALLMAN) $(MAN8) $(MANDIR)
 	cd $(SBINDIR) && $(RM) -f $(RPROG) && $(LN_S) $(PROG) $(RPROG)
 	cd $(MANDIR) && $(RM) -f $(RMAN8) && $(LN_S) $(MAN8) $(RMAN8)
 
diff --git a/rmt/Makefile.in b/rmt/Makefile.in
index b3a0a4b..994239c 100644
--- a/rmt/Makefile.in
+++ b/rmt/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.5 2001/04/06 10:09:40 stelian Exp $
+# $Id: Makefile.in,v 1.6 2002/01/02 10:13:16 stelian Exp $
 
 top_srcdir=	@top_srcdir@
 srcdir=		@srcdir@
@@ -6,7 +6,7 @@ srcdir=		@srcdir@
 @MCONFIG@
 
 CFLAGS=		@CCOPTS@ -pipe $(OPT) $(GINC) $(INC) $(DEFS)
-LDFLAGS:=	$(LDFLAGS) @STATIC@
+LDFLAGS=	@LDOPTS@ @STATIC@
 LIBS=		$(GLIBS)
 
 #DEBUG=		-DFDEBUG -DTDEBUG -DWRITEDEBUG
-- 
2.39.5