Browse Source

* avoid use of single quotes in Makefile under OS/2

git-svn-id: trunk@29621 -
Tomas Hajny 10 years ago
parent
commit
6e4dea39d3
2 changed files with 16 additions and 0 deletions
  1. 8 0
      tests/tstunits/Makefile
  2. 8 0
      tests/tstunits/Makefile.fpc

+ 8 - 0
tests/tstunits/Makefile

@@ -1829,7 +1829,11 @@ endif
 DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
 rtl-stamp.$(FULL_TARGET):
+ifneq ($(inOS2),)
+	$(MAKE) -C ../../rtl all "OPT=$(OPT) -n" "CROSSOPT=$(CROSSOPT)"
+else
 	$(MAKE) -C ../../rtl all 'OPT=$(OPT) -n' 'CROSSOPT=$(CROSSOPT)'
+endif
 	$(MAKE) -C ../../rtl install $(INSTALLOPT) OPT= CROSSOPT=
 	$(ECHO) Compiled > rtl-stamp.$(FULL_TARGET)
 cleanrtl:
@@ -1858,7 +1862,11 @@ DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
 PACKAGESDIR=../../packages
 packages-stamp.$(FULL_TARGET):
+ifneq ($(inOS2),)
+	$(MAKE) -C ../../packages all "OPT=$(OPT) -n" "CROSSOPT=$(CROSSOPT)"
+else
 	$(MAKE) -C ../../packages all 'OPT=$(OPT) -n' 'CROSSOPT=$(CROSSOPT)'
+endif
 	$(MAKE) -C ../../packages install $(INSTALLOPT) OPT= CROSSOPT=
 	$(ECHO) Compiled > packages-stamp.$(FULL_TARGET)
 cleanpackages:

+ 8 - 0
tests/tstunits/Makefile.fpc

@@ -49,7 +49,11 @@ DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
 
 rtl-stamp.$(FULL_TARGET):
+ifneq ($(inOS2),)
+        $(MAKE) -C ../../rtl all "OPT=$(OPT) -n" "CROSSOPT=$(CROSSOPT)"
+else
         $(MAKE) -C ../../rtl all 'OPT=$(OPT) -n' 'CROSSOPT=$(CROSSOPT)'
+endif
         $(MAKE) -C ../../rtl install $(INSTALLOPT) OPT= CROSSOPT=
         $(ECHO) Compiled > rtl-stamp.$(FULL_TARGET)
 
@@ -98,7 +102,11 @@ INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPIL
 PACKAGESDIR=../../packages
 
 packages-stamp.$(FULL_TARGET):
+ifneq ($(inOS2),)
+        $(MAKE) -C ../../packages all "OPT=$(OPT) -n" "CROSSOPT=$(CROSSOPT)"
+else
         $(MAKE) -C ../../packages all 'OPT=$(OPT) -n' 'CROSSOPT=$(CROSSOPT)'
+endif
         $(MAKE) -C ../../packages install $(INSTALLOPT) OPT= CROSSOPT=
         $(ECHO) Compiled > packages-stamp.$(FULL_TARGET)