* fixed Makefile to build writeidx on win32 and linux

git-svn-id: trunk@8852 -

installer/Makefile

@@ -1,11 +1,12 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/08/22]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/18]
 #
 default: all
 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-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
+OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
 .PHONY: FORCE
 override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
@@ -56,6 +57,11 @@ else
 SRCBATCHEXT=.bat
 endif
 endif
+ifdef COMSPEC
+ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)
+RUNBATCH=$(COMSPEC) /C
+endif
+endif
 ifdef inUnix
 PATHSEP=/
 else
@@ -233,190 +239,190 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
 override PACKAGE_NAME=installer
 override PACKAGE_VERSION=2.0.0
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_PROGRAMS+=installer
+override TARGET_PROGRAMS+=installer writeidx
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_PROGRAMS+=install
+override TARGET_PROGRAMS+=install writeidx
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_PROGRAMS+=install
+override TARGET_PROGRAMS+=install writeidx
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_PROGRAMS+=install
+override TARGET_PROGRAMS+=install writeidx
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_PROGRAMS+=installer
+override TARGET_PROGRAMS+=installer writeidx
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_PROGRAMS+=installer
+override TARGET_PROGRAMS+=installer writeidx
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_PROGRAMS+=installer
+override TARGET_PROGRAMS+=installer writeidx
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_PROGRAMS+=installer
+override TARGET_PROGRAMS+=installer writeidx
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_PROGRAMS+=installer
+override TARGET_PROGRAMS+=installer writeidx
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_PROGRAMS+=installer
+override TARGET_PROGRAMS+=installer writeidx
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override CLEAN_UNITS+=scroll
+override CLEAN_UNITS+=scroll insthelp
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override CLEAN_FILES+=installer.pas
@@ -1696,7 +1702,7 @@ override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-XP$(BINUTILSPREFIX) 
+override FPCOPT+=-XP$(BINUTILSPREFIX)
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
@@ -1828,9 +1834,13 @@ ifeq (,$(findstring -s ,$(COMPILER)))
 EXECPPAS=
 else
 ifeq ($(FULL_SOURCE),$(FULL_TARGET))
+ifdef RUNBATCH
+EXECPPAS:=@$(RUNBATCH) $(PPAS)
+else
 EXECPPAS:=@$(PPAS)
 endif
 endif
+endif
 .PHONY: fpc_exes
 ifndef CROSSINSTALL
 ifneq ($(TARGET_PROGRAMS),)
@@ -2062,8 +2072,12 @@ else
 endif
 ifdef inUnix
 	/bin/sh $(ZIPWRAPPER)
+else
+ifdef RUNBATCH
+	$(RUNBATCH) (ZIPWRAPPER)
 else
 	$(ZIPWRAPPER)
+endif
 endif
 	$(DEL) $(ZIPWRAPPER)
 else
@@ -2283,3 +2297,4 @@ installer.pas: install.pas
 	$(COPY) install.pas installer.pas
 install$(EXEEXT) : install.pas scroll.pas
 installer$(EXEEXT) : installer.pas scroll.pas
+writeidx$(EXEEXT) : writeidx.pas insthelp.pas

installer/Makefile.fpc

@@ -7,13 +7,13 @@ name=installer
 version=2.0.0
 
 [target]
-programs_go32v2=install
-programs_win32=install
-programs_os2=install
-programs_linux=installer
+programs_go32v2=install writeidx
+programs_win32=install writeidx
+programs_os2=install writeidx
+programs_linux=installer writeidx
 
 [clean]
-units=scroll
+units=scroll insthelp
 files_linux=installer.pas
 
 [require]
@@ -45,3 +45,5 @@ installer.pas: install.pas
 install$(EXEEXT) : install.pas scroll.pas
 
 installer$(EXEEXT) : installer.pas scroll.pas
+
+writeidx$(EXEEXT) : writeidx.pas insthelp.pas