From 3a3d53418bd204358ae977ba81d762c636d13eed Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Thu, 19 Aug 1999 06:50:25 +0000
Subject: [PATCH] + Changes from Sebastian Gunther

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

diff --git a/base/makefile.fpc b/base/makefile.fpc
index 0defb72d63..8ec554c6e1 100644
--- a/base/makefile.fpc
+++ b/base/makefile.fpc
@@ -714,7 +714,7 @@ fpc_exes: $(EXEFILES)
 
 # Default sharedlib units are all unit objects
 ifndef SHAREDLIBUNITOBJECTS
-SHAREDLIBUNITOBJECTS=UNITOBJECTS
+SHAREDLIBUNITOBJECTS=$(UNITOBJECTS)
 endif
 
 fpc_staticlib:
@@ -800,7 +800,11 @@ fpc_staticinstall: staticlib
 
 fpc_sharedinstall: sharedlib
 	$(MKDIR) $(SHARED_UNITINSTALLDIR)
+ifdef UNITINSTALLFILES
 	$(INSTALL) $(UNITINSTALLFILES) $(SHARED_UNITINSTALLDIR)
+else
+	$(INSTALL) $(UNITOFILES) $(SHARED_UNITINSTALLDIR)
+endif
 	$(MKDIR) $(SHARED_LIBINSTALLDIR)
 	$(INSTALLEXE) *$(SHAREDLIBEXT) $(SHARED_LIBINSTALLDIR)
 
@@ -1044,7 +1048,10 @@ endif
 
 #
 # $Log$
-# Revision 1.44  1999-08-13 15:35:37  peter
+# Revision 1.45  1999-08-19 06:50:25  michael
+# + Changes from Sebastian Gunther
+#
+# Revision 1.44  1999/08/13 15:35:37  peter
 #   * UPX -> UPXPROG, because upx 0.80+ use the environment itself
 #
 # Revision 1.43  1999/08/09 22:19:46  peter