瀏覽代碼

Don't copy binw32 files if the original tools (cp.exe) is already in the destination dir.
This allows installation over an old installation

peter 20 年之前
父節點
當前提交
d50391468c
共有 2 個文件被更改,包括 8 次插入2 次删除
  1. 6 2
      Makefile
  2. 2 0
      Makefile.fpc

+ 6 - 2
Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/05/05]
 #
 default: help
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
@@ -1150,7 +1150,7 @@ export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
-TAROPT=vI
+TAROPT=vj
 TAREXT=.tar.bz2
 else
 TAROPT=vz
@@ -2336,6 +2336,8 @@ help:
 	@$(ECHO)
 	@$(ECHO) go32v2zip,win32zip,linuxzip,freebsdzip,sourcezip,os2zip,emxzip,beoszip,sunoszip,qnxzip,amigazip
 	@$(ECHO)
+	@$(ECHO) Or type 'make all' to build everything
+	@$(ECHO)
 	@exit
 .PHONY: compiler_cycle
 compiler_cycle:
@@ -2402,9 +2404,11 @@ ifeq ($(OS_TARGET),go32v2)
 	$(COPY) $(CVSINSTALL)/bingo32/*.dxe $(INSTALL_BINDIR)
 	$(COPY) $(CVSINSTALL)/bingo32/*.exe $(INSTALL_BINDIR)
 endif
+ifneq ($(patsubst %/,%,$(subst \,/,$(dir $(CPPROG)))),$(patsubst %/,%,$(subst \,/,$(INSTALL_BINDIR))))
 ifeq ($(OS_TARGET),win32)
 	$(COPY) $(addprefix $(CVSINSTALL)/binw32/,*.ico *.exe *.dll *.h) $(INSTALL_BINDIR)
 endif
+endif
 ifeq ($(OS_TARGET),os2)
 	$(COPY) $(addprefix $(CVSINSTALL)/binos2/,*.ico *.dll) $(INSTALL_BINDIR)
 endif

+ 2 - 0
Makefile.fpc

@@ -297,9 +297,11 @@ ifeq ($(OS_TARGET),go32v2)
         $(COPY) $(CVSINSTALL)/bingo32/*.exe $(INSTALL_BINDIR)
 endif
 # binw32 (*.dll,*.exe,*.ico)
+ifneq ($(patsubst %/,%,$(subst \,/,$(dir $(CPPROG)))),$(patsubst %/,%,$(subst \,/,$(INSTALL_BINDIR))))
 ifeq ($(OS_TARGET),win32)
         $(COPY) $(addprefix $(CVSINSTALL)/binw32/,*.ico *.exe *.dll *.h) $(INSTALL_BINDIR)
 endif
+endif
 # binos2 (emx.dll,emxwrap.dll,unzip32.dll,fp2.ico)
 ifeq ($(OS_TARGET),os2)
         $(COPY) $(addprefix $(CVSINSTALL)/binos2/,*.ico *.dll) $(INSTALL_BINDIR)