diff -ur LCG-DM-1.7.3.1.orig/Imakefile LCG-DM-1.7.3.1/Imakefile --- LCG-DM-1.7.3.1.orig/Imakefile 2009-02-19 00:14:09.000000000 +0100 +++ LCG-DM-1.7.3.1/Imakefile 2009-12-07 13:00:29.682188046 +0100 @@ -111,10 +111,9 @@ (cd test; $(MAKE) all) Makefiles: - @. ./setosflags ;\ for i in $(SUBDIRS) test ;\ do (echo " $$i:" ; cd $$i ;\ - ../imake/imake -I../config -DOSMajorVersion="$$OSMAJNO" -DOSMinorVersion="$$OSMINNO" ;\ + imake -Ui386 -I../config ;\ $(MAKE) $(MFLAGS) $@ \ ) ; done ; diff -ur LCG-DM-1.7.3.1.orig/Makefile.ini LCG-DM-1.7.3.1/Makefile.ini --- LCG-DM-1.7.3.1.orig/Makefile.ini 1999-10-22 11:44:58.000000000 +0200 +++ LCG-DM-1.7.3.1/Makefile.ini 2009-12-07 12:59:47.138188149 +0100 @@ -15,7 +15,5 @@ test: Makefiles (cd test; $(MAKE) all) Makefiles: - @. ./setosflags ;\ - (cd imake; $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$$BOOTSTRAPCFLAGS") ;\ - imake/imake -v -Iconfig -DOSMajorVersion=$$OSMAJNO -DOSMinorVersion=$$OSMINNO + imake -Ui386 -Iconfig $(MAKE) $@ diff -ur LCG-DM-1.7.3.1.orig/test/Imakefile LCG-DM-1.7.3.1/test/Imakefile --- LCG-DM-1.7.3.1.orig/test/Imakefile 2008-09-24 13:25:01.000000000 +0200 +++ LCG-DM-1.7.3.1/test/Imakefile 2009-12-07 13:01:10.579186477 +0100 @@ -27,12 +27,11 @@ @echo Not supported on this platform #else Makefiles: - @. ../setosflags ;\ for i in $(SUBDIRS) ;\ do (if [ -d $$i ] ;\ then \ (echo " $$i:" ; cd $$i ;\ - ../../imake/imake -I../../config -DOSMajorVersion="$$OSMAJNO" -DOSMinorVersion="$$OSMINNO" ;\ + imake -Ui386 -I../../config ;\ $(MAKE) $(MFLAGS) $@) ;\ else \ (echo "ERROR : No directory $$i" ;\