* remove ppufiles

  * fix staticlib prefix that is now libp instead of lib

utils/fpcm/fpcmake.ini

@@ -19,7 +19,7 @@ override PATH:=$(subst \,/,$(PATH))
 # that normally doesn't exists in path names.
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
-SEARCHPATH:=$(subst .,,$(subst :, ,$(PATH)))
+SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
 else
 SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
@@ -320,7 +320,7 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.so
-LIBPREFIX=lib
+STATICLIBPREFIX=libp
 RSTEXT=.rst
 FPCMADE=fpcmade
 
@@ -333,14 +333,14 @@ ASMEXT=.s1
 SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
-LIBPREFIX=
+STATICLIBPREFIX=
 FPCMADE=fpcmade.v1
 PACKAGESUFFIX=v1
 endif
 
 # Go32v2
 ifeq ($(OS_TARGET),go32v2)
-LIBPREFIX=
+STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
@@ -478,9 +478,11 @@ endif
 ifndef INSTALL_UNITDIR
 INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
 ifdef INSTALL_FPCPACKAGE
+ifdef PACKAGE_NAME
 INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
 endif
 endif
+endif
 
 # Where to install shared libraries
 ifndef INSTALL_LIBDIR
@@ -770,7 +772,7 @@ fpc_units: $(UNITPPUFILES)
 
 ifdef TARGET_PROGRAMS
 override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
+override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
@@ -806,7 +808,7 @@ ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
-override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
+override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
 ifeq ($(OS_TARGET),os2)
@@ -906,15 +908,10 @@ override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 
 ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
 override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
 override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
 endif
-endif
 
 ifdef INSTALLEXEFILES
 override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
@@ -1095,14 +1092,9 @@ override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
 endif
 
 ifdef CLEANPPUFILES
+override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES)))
 override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES))
-# Get the .o and .a files created for the units
-ifdef PPUFILES
-CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))
-else
-CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))))
-endif
-override CLEANPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES))
+override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES)))
 endif
 
 fpc_clean: $(CLEANTARGET)
@@ -1189,7 +1181,6 @@ fpc_info:
         @$(ECHO)  Date...... $(DATE)
         @$(ECHO)  FPCMake... $(FPCMAKE)
         @$(ECHO)  PPUMove... $(PPUMOVE)
-        @$(ECHO)  PPUFiles.. $(PPUFILES)
         @$(ECHO)  Upx....... $(UPXPROG)
         @$(ECHO)  Zip....... $(ZIPPROG)
         @$(ECHO)

utils/fpcm/fpcmwr.pp

@@ -663,7 +663,6 @@ implementation
         AddTool('RMPROG','rm','');
         AddTool('MVPROG','mv','');
         AddIniSection('shelltools');
-        AddTool('PPUFILES','ppufiles','');
         AddTool('PPUMOVE','ppumove','');
         AddTool('FPCMAKE','fpcmake','');
         AddTool('ZIPPROG','zip','');
@@ -863,7 +862,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.11  2001-06-06 21:58:25  peter
+  Revision 1.12  2001-06-07 21:21:38  peter
+    * remove ppufiles
+    * fix staticlib prefix that is now libp instead of lib
+
+  Revision 1.11  2001/06/06 21:58:25  peter
     * Win32 fixes for Makefile so it doesn't require sh.exe
 
   Revision 1.10  2001/06/04 22:18:16  peter