Browse Source

adapt makefiles to subdirs in compiler dir

pierre 25 years ago
parent
commit
0430614855
2 changed files with 8 additions and 6 deletions
  1. 5 4
      ide/text/Makefile
  2. 3 2
      ide/text/Makefile.fpc

+ 5 - 4
ide/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/01]
+# Makefile generated by fpcmake v1.00 [2000/10/25]
 #
 
 defaultrule: all
@@ -212,7 +212,8 @@ INFOTARGET=fpc_infocfg fpc_infoobjects fpc_infoinstall
 
 # when making a full version include the compiler
 ifeq ($(FULL),1)
-override UNITDIR+=../../compiler
+override UNITDIR+=../../compiler ../../compiler/$(CPU_TARGET)
+override INCDIR+=../../compiler ../../compiler/$(CPU_TARGET)
 else
 override UNITDIR+=../fake/compiler
 endif
@@ -304,7 +305,7 @@ endif
 # To install files
 ifndef INSTALL
 ifdef inUnix
-INSTALL:=install -m 644
+INSTALL:=install -c -m 644
 else
 INSTALL:=$(COPY)
 endif
@@ -313,7 +314,7 @@ endif
 # To install programs
 ifndef INSTALLEXE
 ifdef inUnix
-INSTALLEXE:=install -m 755
+INSTALLEXE:=install -c -m 755
 else
 INSTALLEXE:=$(COPY)
 endif

+ 3 - 2
ide/text/Makefile.fpc

@@ -23,7 +23,8 @@ libgcc=1
 [postsettings]
 # when making a full version include the compiler
 ifeq ($(FULL),1)
-override UNITDIR+=../../compiler
+override UNITDIR+=../../compiler ../../compiler/$(CPU_TARGET)
+override INCDIR+=../../compiler ../../compiler/$(CPU_TARGET)
 else
 override UNITDIR+=../fake/compiler
 endif
@@ -122,4 +123,4 @@ install: fpc_install
 # Misc
 #
 clean_compiler:
-        $(MAKE) -C ../../compiler clean
+        $(MAKE) -C ../../compiler clean