From a0902ea0bab14bda05bd61627101640dbe82ee8c Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Fri, 22 Jan 1999 10:26:25 +0000
Subject: [PATCH]   * libname only used when libtype is set or smartlink

---
 base/makefile.fpc | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/base/makefile.fpc b/base/makefile.fpc
index 0cbb012ca5..ab0f32a4fc 100644
--- a/base/makefile.fpc
+++ b/base/makefile.fpc
@@ -426,21 +426,25 @@ ifeq ($(LIBTYPE),shared)
 override SMARTLINK=NO
 else
 override PPOPT+=-Cx
+ifneq ($(LIBNAME),)
+override PPOPT+=-o$(LIBNAME)
+endif
 endif
 endif
 
 # Add library type, for static libraries smartlinking is automatic used
 ifeq ($(LIBTYPE),shared)
 override PPOPT+=-CD
+ifneq ($(LIBNAME),)
+override PPOPT+=-o$(LIBNAME)
+endif
 else
 ifeq ($(LIBTYPE),static)
 override PPOPT+=-CS
-endif
-endif
-
-# Add library name
 ifneq ($(LIBNAME),)
-override PPOPT:=$(PPOPT) -o$(LIBNAME)
+override PPOPT+=-o$(LIBNAME)
+endif
+endif
 endif
 
 # Add defines from PPOPTDEF to PPOPT