* merged from fixes branch

Makefile.fpc

@@ -452,7 +452,7 @@ debcopy: distclean
         $(COPYTREE) utils $(DEBSRCDIR)
         $(COPYTREE) logs $(DEBSRCDIR)
         $(COPYTREE) docs $(DEBSRCDIR)
-        $(COPYTREE) base/Makefile* $(DEBSRCDIR)
+        $(COPYTREE) Makefile* $(DEBSRCDIR)
         $(COPYTREE) $(CVSINSTALL)/debian $(DEBSRCDIR)
         $(COPYTREE) $(CVSINSTALL)/man $(DEBSRCDIR)
         $(COPYTREE) $(CVSINSTALL)/doc $(DEBSRCDIR)
@@ -484,7 +484,7 @@ rpmcopy: distclean
         $(COPYTREE) packages $(RPMSRCDIR)
         $(COPYTREE) utils $(RPMSRCDIR)
         $(COPYTREE) logs $(RPMSRCDIR)
-        $(COPYTREE) base/Makefile* $(RPMSRCDIR)
+        $(COPYTREE) Makefile* $(RPMSRCDIR)
         $(COPYTREE) $(CVSINSTALL)/man $(RPMSRCDIR)
         $(COPYTREE) $(CVSINSTALL)/doc $(RPMSRCDIR)
         $(COPYTREE) $(CVSINSTALL)/demo $(RPMSRCDIR)