diff options
author | hajny <hajny@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2014-02-01 00:11:09 +0000 |
---|---|---|
committer | hajny <hajny@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2014-02-01 00:11:09 +0000 |
commit | 4f1c2dac92373a26baa1ec0bb3398b03ffe986f9 (patch) | |
tree | 845a760eff8782eb3e29e6069828a9a53f1b092f /packages/httpd24 | |
parent | 422630266b7538e015632737d6a763c34f0bc600 (diff) | |
download | fpc-4f1c2dac92373a26baa1ec0bb3398b03ffe986f9.tar.gz |
* always use forward slashes in path to fpmake similarly to paths to other tools in Makefiles
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@26641 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/httpd24')
-rw-r--r-- | packages/httpd24/Makefile | 4 | ||||
-rw-r--r-- | packages/httpd24/Makefile.fpc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/httpd24/Makefile b/packages/httpd24/Makefile index 041c30f316..6bfe26ed13 100644 --- a/packages/httpd24/Makefile +++ b/packages/httpd24/Makefile @@ -321,14 +321,14 @@ endif endif override PACKAGE_NAME=httpd24 override PACKAGE_VERSION=2.7.1 -FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +FPMAKE_BIN_CLEAN=$(wildcard ./fpmake$(SRCEXEEXT)) ifdef OS_TARGET FPC_TARGETOPT+=--os=$(OS_TARGET) endif ifdef CPU_TARGET FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif -LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) +LOCALFPMAKE=./fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) diff --git a/packages/httpd24/Makefile.fpc b/packages/httpd24/Makefile.fpc index c82f998ee5..2ea0e41841 100644 --- a/packages/httpd24/Makefile.fpc +++ b/packages/httpd24/Makefile.fpc @@ -16,14 +16,14 @@ fpcpackage=y fpcdir=../.. [prerules] -FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +FPMAKE_BIN_CLEAN=$(wildcard ./fpmake$(SRCEXEEXT)) ifdef OS_TARGET FPC_TARGETOPT+=--os=$(OS_TARGET) endif ifdef CPU_TARGET FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif -LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) +LOCALFPMAKE=./fpmake$(SRCEXEEXT) [rules] # Do not pass the Makefile's unit and binary target locations. fpmake uses it's own. |